Fossil SCM
Remove two defined(__CYGWIN__) checks, as reported/requested off-list by Jan Nijtmans.
Commit
abbefbf13a64a861818807232f904e1d4ab440400bac488c0963c8e0a6934676
Parent
b6d02fe9648529c…
2 files changed
+1
-1
+1
-1
+1
-1
| --- src/blob.c | ||
| +++ src/blob.c | ||
| @@ -1994,11 +1994,11 @@ | ||
| 1994 | 1994 | zUtf8 = blob_str(pBlob) + bomSize; |
| 1995 | 1995 | zUtf8 = fossil_unicode_to_utf8(zUtf8); |
| 1996 | 1996 | blob_reset(pBlob); |
| 1997 | 1997 | blob_set_dynamic(pBlob, zUtf8); |
| 1998 | 1998 | }else if( useMbcs && invalid_utf8(pBlob) ){ |
| 1999 | -#if defined(_WIN32) || defined(__CYGWIN__) | |
| 1999 | +#if defined(_WIN32) | |
| 2000 | 2000 | zUtf8 = fossil_mbcs_to_utf8(blob_str(pBlob)); |
| 2001 | 2001 | blob_reset(pBlob); |
| 2002 | 2002 | blob_append(pBlob, zUtf8, -1); |
| 2003 | 2003 | fossil_mbcs_free(zUtf8); |
| 2004 | 2004 | #else |
| 2005 | 2005 |
| --- src/blob.c | |
| +++ src/blob.c | |
| @@ -1994,11 +1994,11 @@ | |
| 1994 | zUtf8 = blob_str(pBlob) + bomSize; |
| 1995 | zUtf8 = fossil_unicode_to_utf8(zUtf8); |
| 1996 | blob_reset(pBlob); |
| 1997 | blob_set_dynamic(pBlob, zUtf8); |
| 1998 | }else if( useMbcs && invalid_utf8(pBlob) ){ |
| 1999 | #if defined(_WIN32) || defined(__CYGWIN__) |
| 2000 | zUtf8 = fossil_mbcs_to_utf8(blob_str(pBlob)); |
| 2001 | blob_reset(pBlob); |
| 2002 | blob_append(pBlob, zUtf8, -1); |
| 2003 | fossil_mbcs_free(zUtf8); |
| 2004 | #else |
| 2005 |
| --- src/blob.c | |
| +++ src/blob.c | |
| @@ -1994,11 +1994,11 @@ | |
| 1994 | zUtf8 = blob_str(pBlob) + bomSize; |
| 1995 | zUtf8 = fossil_unicode_to_utf8(zUtf8); |
| 1996 | blob_reset(pBlob); |
| 1997 | blob_set_dynamic(pBlob, zUtf8); |
| 1998 | }else if( useMbcs && invalid_utf8(pBlob) ){ |
| 1999 | #if defined(_WIN32) |
| 2000 | zUtf8 = fossil_mbcs_to_utf8(blob_str(pBlob)); |
| 2001 | blob_reset(pBlob); |
| 2002 | blob_append(pBlob, zUtf8, -1); |
| 2003 | fossil_mbcs_free(zUtf8); |
| 2004 | #else |
| 2005 |
+1
-1
| --- src/utf8.c | ||
| +++ src/utf8.c | ||
| @@ -25,11 +25,11 @@ | ||
| 25 | 25 | #ifdef _WIN32 |
| 26 | 26 | # include <windows.h> |
| 27 | 27 | #endif |
| 28 | 28 | #include "cygsup.h" |
| 29 | 29 | |
| 30 | -#if defined(_WIN32) || defined(__CYGWIN__) | |
| 30 | +#if defined(_WIN32) | |
| 31 | 31 | /* |
| 32 | 32 | ** Translate MBCS to UTF-8. Return a pointer to the translated text. |
| 33 | 33 | ** Call fossil_mbcs_free() to deallocate any memory used to store the |
| 34 | 34 | ** returned pointer when done. |
| 35 | 35 | */ |
| 36 | 36 |
| --- src/utf8.c | |
| +++ src/utf8.c | |
| @@ -25,11 +25,11 @@ | |
| 25 | #ifdef _WIN32 |
| 26 | # include <windows.h> |
| 27 | #endif |
| 28 | #include "cygsup.h" |
| 29 | |
| 30 | #if defined(_WIN32) || defined(__CYGWIN__) |
| 31 | /* |
| 32 | ** Translate MBCS to UTF-8. Return a pointer to the translated text. |
| 33 | ** Call fossil_mbcs_free() to deallocate any memory used to store the |
| 34 | ** returned pointer when done. |
| 35 | */ |
| 36 |
| --- src/utf8.c | |
| +++ src/utf8.c | |
| @@ -25,11 +25,11 @@ | |
| 25 | #ifdef _WIN32 |
| 26 | # include <windows.h> |
| 27 | #endif |
| 28 | #include "cygsup.h" |
| 29 | |
| 30 | #if defined(_WIN32) |
| 31 | /* |
| 32 | ** Translate MBCS to UTF-8. Return a pointer to the translated text. |
| 33 | ** Call fossil_mbcs_free() to deallocate any memory used to store the |
| 34 | ** returned pointer when done. |
| 35 | */ |
| 36 |