Fossil SCM

Merging latest updates from trunk.

sdr 2014-09-21 03:05 bad-winsymlink merge
Commit 0ee7e92222a5e3ed1a08e8ff792bc6bee77d707a
1 file changed +2 -1
--- src/makeheaders.c
+++ src/makeheaders.c
@@ -37,15 +37,16 @@
3737
#include <stdlib.h>
3838
#include <ctype.h>
3939
#include <memory.h>
4040
#include <sys/stat.h>
4141
#include <assert.h>
42
+#include <string.h>
43
+
4244
#if defined( __MINGW32__) || defined(__DMC__) || defined(_MSC_VER) || defined(__POCC__)
4345
# ifndef WIN32
4446
# define WIN32
4547
# endif
46
-# include <string.h>
4748
#else
4849
# include <unistd.h>
4950
#endif
5051
5152
/*
5253
--- src/makeheaders.c
+++ src/makeheaders.c
@@ -37,15 +37,16 @@
37 #include <stdlib.h>
38 #include <ctype.h>
39 #include <memory.h>
40 #include <sys/stat.h>
41 #include <assert.h>
 
 
42 #if defined( __MINGW32__) || defined(__DMC__) || defined(_MSC_VER) || defined(__POCC__)
43 # ifndef WIN32
44 # define WIN32
45 # endif
46 # include <string.h>
47 #else
48 # include <unistd.h>
49 #endif
50
51 /*
52
--- src/makeheaders.c
+++ src/makeheaders.c
@@ -37,15 +37,16 @@
37 #include <stdlib.h>
38 #include <ctype.h>
39 #include <memory.h>
40 #include <sys/stat.h>
41 #include <assert.h>
42 #include <string.h>
43
44 #if defined( __MINGW32__) || defined(__DMC__) || defined(_MSC_VER) || defined(__POCC__)
45 # ifndef WIN32
46 # define WIN32
47 # endif
 
48 #else
49 # include <unistd.h>
50 #endif
51
52 /*
53

Keyboard Shortcuts

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