Fossil SCM
fixed mis-matched ifdef for MSVC push/pop macros in cson code.
Commit
ef561ed0a56a45a23ebf4f1cef6abbed8c98d38d
Parent
affb0019c906846…
1 file changed
+4
-2
+4
-2
| --- src/cson_amalgamation.c | ||
| +++ src/cson_amalgamation.c | ||
| @@ -3731,12 +3731,14 @@ | ||
| 3731 | 3731 | *pzNext = z; |
| 3732 | 3732 | return c; |
| 3733 | 3733 | } |
| 3734 | 3734 | #undef READ_UTF8 |
| 3735 | 3735 | |
| 3736 | -#if defined(_WIN32) | |
| 3737 | -# pragma warning( pop ) | |
| 3736 | +#ifdef _MSC_VER | |
| 3737 | +# if _MSC_VER >= 1400 /* Visual Studio 2005 and up */ | |
| 3738 | +# pragma warning( pop ) | |
| 3739 | +# endif | |
| 3738 | 3740 | #endif |
| 3739 | 3741 | |
| 3740 | 3742 | unsigned int cson_string_length_utf8( cson_string const * str ) |
| 3741 | 3743 | { |
| 3742 | 3744 | if( ! str ) return 0; |
| 3743 | 3745 |
| --- src/cson_amalgamation.c | |
| +++ src/cson_amalgamation.c | |
| @@ -3731,12 +3731,14 @@ | |
| 3731 | *pzNext = z; |
| 3732 | return c; |
| 3733 | } |
| 3734 | #undef READ_UTF8 |
| 3735 | |
| 3736 | #if defined(_WIN32) |
| 3737 | # pragma warning( pop ) |
| 3738 | #endif |
| 3739 | |
| 3740 | unsigned int cson_string_length_utf8( cson_string const * str ) |
| 3741 | { |
| 3742 | if( ! str ) return 0; |
| 3743 |
| --- src/cson_amalgamation.c | |
| +++ src/cson_amalgamation.c | |
| @@ -3731,12 +3731,14 @@ | |
| 3731 | *pzNext = z; |
| 3732 | return c; |
| 3733 | } |
| 3734 | #undef READ_UTF8 |
| 3735 | |
| 3736 | #ifdef _MSC_VER |
| 3737 | # if _MSC_VER >= 1400 /* Visual Studio 2005 and up */ |
| 3738 | # pragma warning( pop ) |
| 3739 | # endif |
| 3740 | #endif |
| 3741 | |
| 3742 | unsigned int cson_string_length_utf8( cson_string const * str ) |
| 3743 | { |
| 3744 | if( ! str ) return 0; |
| 3745 |