minor edits for new date.c with mingw/msys on Windows (CVS 1148)

FossilOrigin-Name: 9392c514501be333a3c22b552dc036e083eb22b4

diff --git a/manifest b/manifest
index 8b3f46714d95a686dae5427555936ff0153df1bc..d6960c4c79a8f535bc4cf2a9f775372510970b8d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sdate/time\sfunctions\sso\sthat\sthey\scorrectly\shandle\sNULL\sarguments.\s(CVS\s1147)
-D 2003-12-23T16:34:13
+C minor\sedits\sfor\snew\sdate.c\swith\smingw/msys\son\sWindows\s(CVS\s1148)
+D 2003-12-24T01:41:19
 F Makefile.in 0515ff9218ad8d5a8f6220f0494b8ef94c67013b
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -28,7 +28,7 @@ F src/btree.h 9b7c09f1e64274d7bb74a57bbfc63778f67b1048
 F src/btree_rb.c e4084b6a12270674b0cd7034655f55e6a2639c78
 F src/build.c a7493c433de5b552f9535d8fa7ed80aaf135491e
 F src/copy.c 9e47975ea96751c658bcf1a0c4f0bb7c6ee61e73
-F src/date.c a69da8995eec808151f7e82857cbfbc5c70309e3
+F src/date.c d63778679246f83dc707aaaf52a06059ec7c4624
 F src/delete.c 0f81e6799c089487615d38e042a2de4d2d6192bc
 F src/encode.c 25ea901a9cefb3d93774afa4a06b57cb58acf544
 F src/expr.c a14401a54e5923f3e52b6d04a83813d150f43f33
@@ -39,7 +39,7 @@ F src/insert.c 01f66866f35c986eab4a57373ca689a3255ef2df
 F src/main.c 3dd3cae00bade294011da5a3cf9ff660a610c545
 F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565
 F src/os.c 3460bc83541eb276a69723d8babb533559b09344
-F src/os.h 729395fefcca4b81ae056aa9ff67b72bb40dd9e0
+F src/os.h 4101ce267c2f5c8a34914e6af122e97907fcb205
 F src/pager.c ca24fced1ca4c2b8ea519d5fe8ec69a2d846276f
 F src/pager.h 5da62c83443f26b1792cfd72c96c422f91aadd31
 F src/parse.y c65aa6c5508763806ac9734b0589b93480ec7e7a
@@ -179,7 +179,7 @@ F www/speed.tcl 2f6b1155b99d39adb185f900456d1d592c4832b3
 F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
-P 8482b8c44766e7f80fc449b3dbdd3f37396c332b
-R 757f37c1931b5323149da11681dc8f61
-U drh
-Z 97bbf0c2e5044cc3f77063234413c8db
+P a5a5fbd60153dd068ec2559455146e84da075b90
+R bc2f40a9da05043940347dcae40bd046
+U dougcurrie
+Z 5bdb9f56b8fd2120ef569c47f01fd9a4

diff --git a/manifest.uuid b/manifest.uuid
index 7141dc8e291ad95716f128f588d75ead017c5c58..5947f5b3f392659df8b414ae90ddd270b2e3017b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a5a5fbd60153dd068ec2559455146e84da075b90
\ No newline at end of file
+9392c514501be333a3c22b552dc036e083eb22b4
\ No newline at end of file

diff --git a/src/date.c b/src/date.c
index 3c8a5a5d612cb00190e5a0b1132e9664c7ed0559..e669c3786df2b53c3281f14e5bc999f7c45c4d09 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -16,7 +16,7 @@
 ** sqliteRegisterDateTimeFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: date.c,v 1.4 2003/12/23 16:34:13 drh Exp $
+** $Id: date.c,v 1.5 2003/12/24 01:41:19 dougcurrie Exp $
 **
 ** NOTES:
 **
@@ -48,12 +48,12 @@
 **      Richmond, Virginia (USA)
 */
 #ifndef SQLITE_OMIT_DATETIME_FUNCS
+#include "os.h"
+#include "sqliteInt.h"
 #include <ctype.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <time.h>
-#include "sqliteInt.h"
-#include "os.h"
 
 /*
 ** A structure for holding a single date and time.

diff --git a/src/os.h b/src/os.h
index e46abb46ace91a32252b074016d4a51f4109cd8b..b415a48cf46406f291b32978b07873653d580b8c 100644 (file)
--- a/src/os.h
+++ b/src/os.h
@@ -132,6 +132,9 @@
 # else
 #  if !defined(_CYGWIN_TYPES_H)
      typedef long long off_t;
+#    if defined(__MINGW32__)
+#      define  _OFF_T_
+#    endif
 #  endif
 # endif
 # define SQLITE_TEMPNAME_SIZE (MAX_PATH+50)