Make the compile work under cygwin.

Tickets #327, #213, #316, #322, #349, #373, and #429. (CVS 1075)

FossilOrigin-Name: 7d8d3252df1e9f6bec5e105b6eca3313cb7e226a

diff --git a/manifest b/manifest
index 5caa282c3cf71f15124f5fe563c212786fa769d6..c914df59e070ab293754b6bc7189312311e20000 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sdelete\stables\swith\sthe\ssame\sname\swhen\sdropping\striggers.\nTicket\s#430.\s(CVS\s1074)
-D 2003-08-16T12:37:52
+C Make\sthe\scompile\swork\sunder\scygwin.\nTickets\s#327,\s#213,\s#316,\s#322,\s#349,\s#373,\sand\s#429.\s(CVS\s1075)
+D 2003-08-16T13:10:52
 F Makefile.in 9ad23ed4ca97f9670c4496432e3fbd4b3760ebde
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -36,7 +36,7 @@ F src/insert.c dc200ae04a36bd36e575272a069e20c528b7fbdf
 F src/main.c 2500392bad5629b6d70b06ac5a076958acb49b92
 F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565
 F src/os.c 97df440bc71f65e22df5d3d920ce39551c0a5f5a
-F src/os.h 4c51809f56daf21efbe26fc932998e865a5bc211
+F src/os.h 729395fefcca4b81ae056aa9ff67b72bb40dd9e0
 F src/pager.c a4fd3a61d63879365f775875edfffaa8c6f3d7f8
 F src/pager.h 5da62c83443f26b1792cfd72c96c422f91aadd31
 F src/parse.y 16aed0e3ed05445fa7f6a4209cc054208c7083c0
@@ -168,7 +168,7 @@ F www/speed.tcl 2f6b1155b99d39adb185f900456d1d592c4832b3
 F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
-P 3563e9cf9d6b20f09e92deb21fdda93bcd8fb583
-R 2e87b58b5a40574a4f4655a00aae49e0
+P ef58f163b08d13f8e9b69459bd83e0bf9d5b404b
+R ce296030d9e4d30410759bccc85cc8c6
 U drh
-Z a19c702b91baa7a5eaffe7897fd8fbab
+Z 56580904bed2b7015cd53a563fb3ab39

diff --git a/manifest.uuid b/manifest.uuid
index c3fc7d3d3c04661d27f88ff86289b319fe791d93..01ce44a777ca75fa43c9a898f217bfeaa3da6eea 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ef58f163b08d13f8e9b69459bd83e0bf9d5b404b
\ No newline at end of file
+7d8d3252df1e9f6bec5e105b6eca3313cb7e226a
\ No newline at end of file

diff --git a/src/os.h b/src/os.h
index 1fdf92538e500f7578b851e9b5e4f389da2edca2..e46abb46ace91a32252b074016d4a51f4109cd8b 100644 (file)
--- a/src/os.h
+++ b/src/os.h
@@ -88,7 +88,9 @@
 # endif
 #else
 # define OS_MAC 0
-# define OS_WIN 0
+# ifndef OS_WIN
+#  define OS_WIN 0
+# endif
 #endif
 
 /*
@@ -115,6 +117,9 @@
 #endif
 
 #if OS_WIN
+# if defined(__CYGWIN__)
+#  define __CYGWIN_USE_BIG_TYPES__
+# endif
 #include <windows.h>
 #include <winbase.h>
   typedef struct OsFile OsFile;
@@ -125,7 +130,9 @@
 # if defined(_MSC_VER) || defined(__BORLANDC__)
     typedef __int64 off_t;
 # else
-    typedef long long off_t;
+#  if !defined(_CYGWIN_TYPES_H)
+     typedef long long off_t;
+#  endif
 # endif
 # define SQLITE_TEMPNAME_SIZE (MAX_PATH+50)
 # define SQLITE_MIN_SLEEP_MS 1