bb85c12e102… — Fossil SCM

M src/cgi.c

+1 -3

		--- src/cgi.c
		+++ src/cgi.c
		@@ -21,13 +21,11 @@
21	21	** formatting function and its cousins, and routines to encode and
22	22	** decode strings in HTML or HTTP.
23	23	*/
24	24	#include "config.h"
25	25	#ifdef _WIN32
26		-# if defined(__MINGW32__)
27		-# include <ws2tcpip.h>
28		-# endif
	26	+# include <ws2tcpip.h>
29	27	#else
30	28	# include <sys/socket.h>
31	29	# include <netinet/in.h>
32	30	# include <arpa/inet.h>
33	31	# include <sys/times.h>
34	32

	--- src/cgi.c
	+++ src/cgi.c
	@@ -21,13 +21,11 @@
21	** formatting function and its cousins, and routines to encode and
22	** decode strings in HTML or HTTP.
23	*/
24	#include "config.h"
25	#ifdef _WIN32
26	# if defined(__MINGW32__)
27	# include <ws2tcpip.h>
28	# endif
29	#else
30	# include <sys/socket.h>
31	# include <netinet/in.h>
32	# include <arpa/inet.h>
33	# include <sys/times.h>
34

	--- src/cgi.c
	+++ src/cgi.c
	@@ -21,13 +21,11 @@
21	** formatting function and its cousins, and routines to encode and
22	** decode strings in HTML or HTTP.
23	*/
24	#include "config.h"
25	#ifdef _WIN32
26	# include <ws2tcpip.h>


27	#else
28	# include <sys/socket.h>
29	# include <netinet/in.h>
30	# include <arpa/inet.h>
31	# include <sys/times.h>
32

M src/makemake.tcl

+1 -1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -903,11 +903,11 @@
903	903
904	904	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
905	905
906	906	CFLAGS = -nologo -MT -O2
907	907	BCC = $(CC) $(CFLAGS)
908		-TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
	908	+TCC = $(CC) -c $(CFLAGS) -DDIRENT_UNICODE=1 $(MSCDEF) $(SSL) $(INCL)
909	909	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
910	910	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
911	911	}
912	912	regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
913	913	writeln "SQLITE_OPTIONS = $MSC_SQLITE_OPTIONS\n"
914	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) $(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) -DDIRENT_UNICODE=1 $(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

+1 -1

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -34,11 +34,11 @@
34	34
35	35	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
36	36
37	37	CFLAGS = -nologo -MT -O2
38	38	BCC = $(CC) $(CFLAGS)
39		-TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
	39	+TCC = $(CC) -c $(CFLAGS) -DDIRENT_UNICODE=1 $(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	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	44
45	45
46	46	ADDED win/Makefile.msc.mistachkin

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -34,11 +34,11 @@
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	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
46	DDED win/Makefile.msc.mistachkin

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -34,11 +34,11 @@
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) -DDIRENT_UNICODE=1 $(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
46	DDED win/Makefile.msc.mistachkin

A win/Makefile.msc.mistachkin

+2

		--- a/win/Makefile.msc.mistachkin
		+++ b/win/Makefile.msc.mistachkin
		@@ -0,0 +1,2 @@
	1	+#
	2	+###d5mergmerge3-DDIRENT_UNICODE=1

	--- a/win/Makefile.msc.mistachkin
	+++ b/win/Makefile.msc.mistachkin
	@@ -0,0 +1,2 @@

	--- a/win/Makefile.msc.mistachkin
	+++ b/win/Makefile.msc.mistachkin
	@@ -0,0 +1,2 @@
1	#
2	###d5mergmerge3-DDIRENT_UNICODE=1

M win/include/dirent.h

+4 -1

		--- win/include/dirent.h
		+++ win/include/dirent.h
		@@ -20,10 +20,13 @@
20	20	* IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR
21	21	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
22	22	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
23	23	* OTHER DEALINGS IN THE SOFTWARE.
24	24	*
	25	+ * Sept 22, 2012, Joe Mistachkin
	26	+ * Check for DIRENT_UNICODE define in addition to UNICODE.
	27	+ *
25	28	* Sept 12, 2012, Jan Nijtmans
26	29	* Switchable wide-character variant.
27	30	*
28	31	* Mar 15, 2011, Toni Ronkko
29	32	* Defined FILE_ATTRIBUTE_DEVICE for MSVC 6.0.
		@@ -148,11 +151,11 @@
148	151	#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
149	152	#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
150	153	#define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR)
151	154	#define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK)
152	155
153		-#ifdef UNICODE
	156	+#if defined(UNICODE) \|\| defined(DIRENT_UNICODE)
154	157	# define dirent _wdirent
155	158	# define opendir _wopendir
156	159	# define readdir _wreaddir
157	160	# define closedir _wclosedir
158	161	# define rewinddir _wrewinddir
159	162

	--- win/include/dirent.h
	+++ win/include/dirent.h
	@@ -20,10 +20,13 @@
20	* IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR
21	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
22	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
23	* OTHER DEALINGS IN THE SOFTWARE.
24	*



25	* Sept 12, 2012, Jan Nijtmans
26	* Switchable wide-character variant.
27	*
28	* Mar 15, 2011, Toni Ronkko
29	* Defined FILE_ATTRIBUTE_DEVICE for MSVC 6.0.
	@@ -148,11 +151,11 @@
148	#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
149	#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
150	#define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR)
151	#define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK)
152
153	#ifdef UNICODE
154	# define dirent _wdirent
155	# define opendir _wopendir
156	# define readdir _wreaddir
157	# define closedir _wclosedir
158	# define rewinddir _wrewinddir
159

	--- win/include/dirent.h
	+++ win/include/dirent.h
	@@ -20,10 +20,13 @@
20	* IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR
21	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
22	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
23	* OTHER DEALINGS IN THE SOFTWARE.
24	*
25	* Sept 22, 2012, Joe Mistachkin
26	* Check for DIRENT_UNICODE define in addition to UNICODE.
27	*
28	* Sept 12, 2012, Jan Nijtmans
29	* Switchable wide-character variant.
30	*
31	* Mar 15, 2011, Toni Ronkko
32	* Defined FILE_ATTRIBUTE_DEVICE for MSVC 6.0.
	@@ -148,11 +151,11 @@
151	#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
152	#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
153	#define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR)
154	#define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK)
155
156	#if defined(UNICODE) \|\| defined(DIRENT_UNICODE)
157	# define dirent _wdirent
158	# define opendir _wopendir
159	# define readdir _wreaddir
160	# define closedir _wclosedir
161	# define rewinddir _wrewinddir
162

Fossil SCM