Fossil SCM
fix merge problem, which cause an OSX broken build
Commit
7885b60187266b40a05fd92d8fa623cf179d35b1
Parent
0c65916136905fc…
1 file changed
+4
-4
+4
-4
| --- src/utf8.c | ||
| +++ src/utf8.c | ||
| @@ -112,11 +112,11 @@ | ||
| 112 | 112 | ** to precomposed UTF8. Return a pointer to the translated text. |
| 113 | 113 | ** Call fossil_filename_free() to deallocate any memory used to store the |
| 114 | 114 | ** returned pointer when done. |
| 115 | 115 | */ |
| 116 | 116 | char *fossil_filename_to_utf8(void *zFilename){ |
| 117 | -#ifdef _WIN32 | |
| 117 | +#if defined(_WIN32) | |
| 118 | 118 | int nByte; |
| 119 | 119 | char *zUtf; |
| 120 | 120 | WCHAR *wUnicode = zFilename; |
| 121 | 121 | while( *wUnicode != 0 ){ |
| 122 | 122 | if ( (*wUnicode & 0xFF80) == 0xF000 ){ |
| @@ -155,15 +155,13 @@ | ||
| 155 | 155 | }else{ |
| 156 | 156 | zOut[n+100-nOutx] = 0; |
| 157 | 157 | } |
| 158 | 158 | iconv_close(cd); |
| 159 | 159 | }else{ |
| 160 | - zOut = fossil_strdup(zUtf); | |
| 160 | + zOut = fossil_strdup(zFilename); | |
| 161 | 161 | } |
| 162 | 162 | return zOut; |
| 163 | -#elif defined(__APPLE__) | |
| 164 | - return fossil_strdup(zFilename); | |
| 165 | 163 | #else |
| 166 | 164 | return (char *)zFilename; /* No-op on non-mac unix */ |
| 167 | 165 | #endif |
| 168 | 166 | } |
| 169 | 167 | |
| @@ -198,10 +196,12 @@ | ||
| 198 | 196 | } |
| 199 | 197 | ++wUnicode; |
| 200 | 198 | } |
| 201 | 199 | |
| 202 | 200 | return zUnicode; |
| 201 | +#elif defined(__APPLE__) | |
| 202 | + return fossil_strdup(zUtf8); | |
| 203 | 203 | #else |
| 204 | 204 | return (void *)zUtf8; /* No-op on unix */ |
| 205 | 205 | #endif |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 |
| --- src/utf8.c | |
| +++ src/utf8.c | |
| @@ -112,11 +112,11 @@ | |
| 112 | ** to precomposed UTF8. Return a pointer to the translated text. |
| 113 | ** Call fossil_filename_free() to deallocate any memory used to store the |
| 114 | ** returned pointer when done. |
| 115 | */ |
| 116 | char *fossil_filename_to_utf8(void *zFilename){ |
| 117 | #ifdef _WIN32 |
| 118 | int nByte; |
| 119 | char *zUtf; |
| 120 | WCHAR *wUnicode = zFilename; |
| 121 | while( *wUnicode != 0 ){ |
| 122 | if ( (*wUnicode & 0xFF80) == 0xF000 ){ |
| @@ -155,15 +155,13 @@ | |
| 155 | }else{ |
| 156 | zOut[n+100-nOutx] = 0; |
| 157 | } |
| 158 | iconv_close(cd); |
| 159 | }else{ |
| 160 | zOut = fossil_strdup(zUtf); |
| 161 | } |
| 162 | return zOut; |
| 163 | #elif defined(__APPLE__) |
| 164 | return fossil_strdup(zFilename); |
| 165 | #else |
| 166 | return (char *)zFilename; /* No-op on non-mac unix */ |
| 167 | #endif |
| 168 | } |
| 169 | |
| @@ -198,10 +196,12 @@ | |
| 198 | } |
| 199 | ++wUnicode; |
| 200 | } |
| 201 | |
| 202 | return zUnicode; |
| 203 | #else |
| 204 | return (void *)zUtf8; /* No-op on unix */ |
| 205 | #endif |
| 206 | } |
| 207 | |
| 208 |
| --- src/utf8.c | |
| +++ src/utf8.c | |
| @@ -112,11 +112,11 @@ | |
| 112 | ** to precomposed UTF8. Return a pointer to the translated text. |
| 113 | ** Call fossil_filename_free() to deallocate any memory used to store the |
| 114 | ** returned pointer when done. |
| 115 | */ |
| 116 | char *fossil_filename_to_utf8(void *zFilename){ |
| 117 | #if defined(_WIN32) |
| 118 | int nByte; |
| 119 | char *zUtf; |
| 120 | WCHAR *wUnicode = zFilename; |
| 121 | while( *wUnicode != 0 ){ |
| 122 | if ( (*wUnicode & 0xFF80) == 0xF000 ){ |
| @@ -155,15 +155,13 @@ | |
| 155 | }else{ |
| 156 | zOut[n+100-nOutx] = 0; |
| 157 | } |
| 158 | iconv_close(cd); |
| 159 | }else{ |
| 160 | zOut = fossil_strdup(zFilename); |
| 161 | } |
| 162 | return zOut; |
| 163 | #else |
| 164 | return (char *)zFilename; /* No-op on non-mac unix */ |
| 165 | #endif |
| 166 | } |
| 167 | |
| @@ -198,10 +196,12 @@ | |
| 196 | } |
| 197 | ++wUnicode; |
| 198 | } |
| 199 | |
| 200 | return zUnicode; |
| 201 | #elif defined(__APPLE__) |
| 202 | return fossil_strdup(zUtf8); |
| 203 | #else |
| 204 | return (void *)zUtf8; /* No-op on unix */ |
| 205 | #endif |
| 206 | } |
| 207 | |
| 208 |