Fossil SCM
Missed one spot where WITHOUT_ICONV is required on the previous check-in.
Commit
fbe87e0cfb9fd0b974afd6bb423e2fcda63707ab
Parent
722791a6a8ee0c5…
1 file changed
+1
-1
+1
-1
| --- src/utf8.c | ||
| +++ src/utf8.c | ||
| @@ -157,11 +157,11 @@ | ||
| 157 | 157 | ** fossil_filename_to_utf8(). |
| 158 | 158 | */ |
| 159 | 159 | void fossil_filename_free(char *pOld){ |
| 160 | 160 | #if defined(_WIN32) |
| 161 | 161 | sqlite3_free(pOld); |
| 162 | -#elif defined(__APPLE__) | |
| 162 | +#elif defined(__APPLE__) && !defined(WITHOUT_ICONV) | |
| 163 | 163 | fossil_free(pOld); |
| 164 | 164 | #else |
| 165 | 165 | /* No-op on all other unix */ |
| 166 | 166 | #endif |
| 167 | 167 | } |
| 168 | 168 |
| --- src/utf8.c | |
| +++ src/utf8.c | |
| @@ -157,11 +157,11 @@ | |
| 157 | ** fossil_filename_to_utf8(). |
| 158 | */ |
| 159 | void fossil_filename_free(char *pOld){ |
| 160 | #if defined(_WIN32) |
| 161 | sqlite3_free(pOld); |
| 162 | #elif defined(__APPLE__) |
| 163 | fossil_free(pOld); |
| 164 | #else |
| 165 | /* No-op on all other unix */ |
| 166 | #endif |
| 167 | } |
| 168 |
| --- src/utf8.c | |
| +++ src/utf8.c | |
| @@ -157,11 +157,11 @@ | |
| 157 | ** fossil_filename_to_utf8(). |
| 158 | */ |
| 159 | void fossil_filename_free(char *pOld){ |
| 160 | #if defined(_WIN32) |
| 161 | sqlite3_free(pOld); |
| 162 | #elif defined(__APPLE__) && !defined(WITHOUT_ICONV) |
| 163 | fossil_free(pOld); |
| 164 | #else |
| 165 | /* No-op on all other unix */ |
| 166 | #endif |
| 167 | } |
| 168 |