Fossil SCM
unbreak MSVC build. <p>Always use platform detection in fossil_system: fossil might be linked with unicows, then still quotes should not be used on Win95 <p>Why did I remove the -DUNICODE from Makefile.msc?....
Commit
ebe241b4df7f606ca103d24267acbdefe90e4dd4
Parent
ed5695fe7fe2afc…
2 files changed
+2
-5
+1
-1
+2
-5
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -830,25 +830,22 @@ | ||
| 830 | 830 | int rc; |
| 831 | 831 | #if defined(_WIN32) |
| 832 | 832 | /* On windows NT, we have to put double-quotes around the entire command. |
| 833 | 833 | ** Who knows why - this is just the way windows works. |
| 834 | 834 | */ |
| 835 | -#ifdef UNICODE | |
| 836 | - char *zNewCmd = mprintf("\"%s\"", zOrigCmd); | |
| 837 | -#else | |
| 838 | 835 | OSVERSIONINFOA sInfo; |
| 839 | 836 | char *zNewCmd; |
| 837 | + TCHAR *zMbcs; | |
| 840 | 838 | |
| 841 | 839 | sInfo.dwOSVersionInfoSize = sizeof(sInfo); |
| 842 | 840 | GetVersionExA(&sInfo); |
| 843 | 841 | if (sInfo.dwPlatformId==VER_PLATFORM_WIN32_NT) { |
| 844 | 842 | zNewCmd = mprintf("\"%s\"", zOrigCmd); |
| 845 | 843 | } else { |
| 846 | 844 | zNewCmd = mprintf("%s", zOrigCmd); |
| 847 | 845 | } |
| 848 | -#endif | |
| 849 | - TCHAR *zMbcs = fossil_utf8_to_mbcs(zNewCmd); | |
| 846 | + zMbcs = fossil_utf8_to_mbcs(zNewCmd); | |
| 850 | 847 | if( g.fSystemTrace ) { |
| 851 | 848 | char *zOut = mprintf("SYSTEM: %s\n", zNewCmd); |
| 852 | 849 | fossil_puts(zOut, 1); |
| 853 | 850 | fossil_free(zOut); |
| 854 | 851 | } |
| 855 | 852 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -830,25 +830,22 @@ | |
| 830 | int rc; |
| 831 | #if defined(_WIN32) |
| 832 | /* On windows NT, we have to put double-quotes around the entire command. |
| 833 | ** Who knows why - this is just the way windows works. |
| 834 | */ |
| 835 | #ifdef UNICODE |
| 836 | char *zNewCmd = mprintf("\"%s\"", zOrigCmd); |
| 837 | #else |
| 838 | OSVERSIONINFOA sInfo; |
| 839 | char *zNewCmd; |
| 840 | |
| 841 | sInfo.dwOSVersionInfoSize = sizeof(sInfo); |
| 842 | GetVersionExA(&sInfo); |
| 843 | if (sInfo.dwPlatformId==VER_PLATFORM_WIN32_NT) { |
| 844 | zNewCmd = mprintf("\"%s\"", zOrigCmd); |
| 845 | } else { |
| 846 | zNewCmd = mprintf("%s", zOrigCmd); |
| 847 | } |
| 848 | #endif |
| 849 | TCHAR *zMbcs = fossil_utf8_to_mbcs(zNewCmd); |
| 850 | if( g.fSystemTrace ) { |
| 851 | char *zOut = mprintf("SYSTEM: %s\n", zNewCmd); |
| 852 | fossil_puts(zOut, 1); |
| 853 | fossil_free(zOut); |
| 854 | } |
| 855 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -830,25 +830,22 @@ | |
| 830 | int rc; |
| 831 | #if defined(_WIN32) |
| 832 | /* On windows NT, we have to put double-quotes around the entire command. |
| 833 | ** Who knows why - this is just the way windows works. |
| 834 | */ |
| 835 | OSVERSIONINFOA sInfo; |
| 836 | char *zNewCmd; |
| 837 | TCHAR *zMbcs; |
| 838 | |
| 839 | sInfo.dwOSVersionInfoSize = sizeof(sInfo); |
| 840 | GetVersionExA(&sInfo); |
| 841 | if (sInfo.dwPlatformId==VER_PLATFORM_WIN32_NT) { |
| 842 | zNewCmd = mprintf("\"%s\"", zOrigCmd); |
| 843 | } else { |
| 844 | zNewCmd = mprintf("%s", zOrigCmd); |
| 845 | } |
| 846 | zMbcs = fossil_utf8_to_mbcs(zNewCmd); |
| 847 | if( g.fSystemTrace ) { |
| 848 | char *zOut = mprintf("SYSTEM: %s\n", zNewCmd); |
| 849 | fossil_puts(zOut, 1); |
| 850 | fossil_free(zOut); |
| 851 | } |
| 852 |
+1
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -32,11 +32,11 @@ | ||
| 32 | 32 | ZLIBDIR = $(MSCDIR)\extra\lib |
| 33 | 33 | ZLIB = zlib.lib |
| 34 | 34 | |
| 35 | 35 | INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR) |
| 36 | 36 | |
| 37 | -CFLAGS = -nologo -MT -O2 | |
| 37 | +CFLAGS = -nologo -MT -O2 -DUNICODE -D_UNICODE | |
| 38 | 38 | BCC = $(CC) $(CFLAGS) |
| 39 | 39 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL) |
| 40 | 40 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB) |
| 41 | 41 | LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR) |
| 42 | 42 | |
| 43 | 43 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -32,11 +32,11 @@ | |
| 32 | ZLIBDIR = $(MSCDIR)\extra\lib |
| 33 | ZLIB = zlib.lib |
| 34 | |
| 35 | INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR) |
| 36 | |
| 37 | CFLAGS = -nologo -MT -O2 |
| 38 | BCC = $(CC) $(CFLAGS) |
| 39 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL) |
| 40 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB) |
| 41 | LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR) |
| 42 | |
| 43 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -32,11 +32,11 @@ | |
| 32 | ZLIBDIR = $(MSCDIR)\extra\lib |
| 33 | ZLIB = zlib.lib |
| 34 | |
| 35 | INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR) |
| 36 | |
| 37 | CFLAGS = -nologo -MT -O2 -DUNICODE -D_UNICODE |
| 38 | BCC = $(CC) $(CFLAGS) |
| 39 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL) |
| 40 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB) |
| 41 | LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR) |
| 42 | |
| 43 |