Fossil SCM

merge trunk

jan.nijtmans 2012-09-13 07:17 UTC restore-win95 merge
Commit 0930ed2085a00298f709e78305925af3697b56a6
Parent a8f7a8ac24ea067…
4 files changed +1 -1 +2 -2 +1 +1
~ src/makemake.tcl ~ win/Makefile.msc ~ win/include/dirent.h ~ win/include/dirent.h
M src/makemake.tcl
+1 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -903,11 +903,11 @@
903903
904904
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
905905
906906
 CFLAGS = -nologo -MT -O2
907907
 BCC = $(CC) $(CFLAGS)
908
-TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
908
+TCC = $(CC) -c $(CFLAGS) -DUNICODE -D_UNICODE $(MSCDEF) $(SSL) $(INCL)
909909
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
910910
 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
911911
 }
912912
 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
913913
 writeln "SQLITE_OPTIONS = $MSC_SQLITE_OPTIONS\n"
914914
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -903,11 +903,11 @@
903
904 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
905
906 CFLAGS = -nologo -MT -O2
907 BCC = $(CC) $(CFLAGS)
908 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
909 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
910 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
911 }
912 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
913 writeln "SQLITE_OPTIONS = $MSC_SQLITE_OPTIONS\n"
914
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -903,11 +903,11 @@
903
904 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
905
906 CFLAGS = -nologo -MT -O2
907 BCC = $(CC) $(CFLAGS)
908 TCC = $(CC) -c $(CFLAGS) -DUNICODE -D_UNICODE $(MSCDEF) $(SSL) $(INCL)
909 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
910 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
911 }
912 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
913 writeln "SQLITE_OPTIONS = $MSC_SQLITE_OPTIONS\n"
914
M win/Makefile.msc
+2 -2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -32,13 +32,13 @@
3232
 ZLIBDIR = $(MSCDIR)\extra\lib
3333
 ZLIB = zlib.lib
3434
3535
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
3636
37
-CFLAGS = -nologo -MT -O2 -DUNICODE -D_UNICODE
37
+CFLAGS = -nologo -MT -O2
3838
 BCC = $(CC) $(CFLAGS)
39
-TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
39
+TCC = $(CC) -c $(CFLAGS) -DUNICODE -D_UNICODE $(MSCDEF) $(SSL) $(INCL)
4040
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
4141
 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
4242
4343
 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
4444
4545
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -32,13 +32,13 @@
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 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
44
45
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -32,13 +32,13 @@
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) -DUNICODE -D_UNICODE $(MSCDEF) $(SSL) $(INCL)
40 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
42
43 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
44
45
M win/include/dirent.h
+1
--- win/include/dirent.h
+++ win/include/dirent.h
@@ -379,10 +379,11 @@
379379
 #ifdef UNICODE
380380
 # undef dirent
381381
 # undef opendir
382382
 # undef readdir
383383
 # undef closedir
384
+# undef rewinddir
384385
 # undef DIR
385386
 #endif
386387
387388
 #ifdef __cplusplus
388389
 }
389390
--- win/include/dirent.h
+++ win/include/dirent.h
@@ -379,10 +379,11 @@
379 #ifdef UNICODE
380 # undef dirent
381 # undef opendir
382 # undef readdir
383 # undef closedir
 
384 # undef DIR
385 #endif
386
387 #ifdef __cplusplus
388 }
389
--- win/include/dirent.h
+++ win/include/dirent.h
@@ -379,10 +379,11 @@
379 #ifdef UNICODE
380 # undef dirent
381 # undef opendir
382 # undef readdir
383 # undef closedir
384 # undef rewinddir
385 # undef DIR
386 #endif
387
388 #ifdef __cplusplus
389 }
390
M win/include/dirent.h
+1
--- win/include/dirent.h
+++ win/include/dirent.h
@@ -379,10 +379,11 @@
379379
 #ifdef UNICODE
380380
 # undef dirent
381381
 # undef opendir
382382
 # undef readdir
383383
 # undef closedir
384
+# undef rewinddir
384385
 # undef DIR
385386
 #endif
386387
387388
 #ifdef __cplusplus
388389
 }
389390
--- win/include/dirent.h
+++ win/include/dirent.h
@@ -379,10 +379,11 @@
379 #ifdef UNICODE
380 # undef dirent
381 # undef opendir
382 # undef readdir
383 # undef closedir
 
384 # undef DIR
385 #endif
386
387 #ifdef __cplusplus
388 }
389
--- win/include/dirent.h
+++ win/include/dirent.h
@@ -379,10 +379,11 @@
379 #ifdef UNICODE
380 # undef dirent
381 # undef opendir
382 # undef readdir
383 # undef closedir
384 # undef rewinddir
385 # undef DIR
386 #endif
387
388 #ifdef __cplusplus
389 }
390

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button