Only define _FILE_OFFSET_BITS if it is not already defined. Ticket #605. (CVS 1227)

FossilOrigin-Name: 300c5543dc83c6b7eacb0c81ed06f95004c0f6d8

diff --git a/manifest b/manifest
index 81bbca6ba8036d29c9d0466ba09f02d7c9f54aff..7e1fbc6ff48bad55bc22bdf70591f6367afc4115 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sshells\sso\sthat\sthey\salways\senable\sthe\scodec\sif\sit\sis\savailable,\neven\sif\sno\skey\sis\ssupplied.\s(CVS\s1226)
-D 2004-02-11T10:37:23
+C Only\sdefine\s_FILE_OFFSET_BITS\sif\sit\sis\snot\salready\sdefined.\s\sTicket\s#605.\s(CVS\s1227)
+D 2004-02-11T16:38:06
 F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -39,7 +39,7 @@ F src/insert.c 01f66866f35c986eab4a57373ca689a3255ef2df
 F src/main.c 6ec57b0f146572033c70493417d251365a7b4fbe
 F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565
 F src/os.c f5fc4954725b2fcd852979f2746085fe8ca27710
-F src/os.h 8d02b622153d2df442da1ec37cdd6b1bd9804a25
+F src/os.h 250a3789be609adfee5c5aa20137ce8683276f24
 F src/pager.c 29ddad4dd454f0aaa98e2bcd327710ab9f02f833
 F src/pager.h 82332878799280145639a48d88cdb4058925e3f6
 F src/parse.y 7a121554c0c0c0150a77ab05417b01fa44813ac4
@@ -183,7 +183,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 1673bf7c7b64542530ee03328186be33cb88c98d
-R cf11e1504e84208ddac23675d6789b35
+P 95989717e17d52b2306374f5cf7613c3bd4e7801
+R b0ef506232fcb43485a462696bd54cae
 U drh
-Z a96d40097a3b13bb21b3a609a39afb50
+Z 354e64ccc1227b93fa380b7cc20e6771

diff --git a/manifest.uuid b/manifest.uuid
index 3f9c58fb489eb808f77bfa2788150aceb1fc0c8a..5e519c8684b29f66fd82ff5d4dc9ddcb91870cd8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-95989717e17d52b2306374f5cf7613c3bd4e7801
\ No newline at end of file
+300c5543dc83c6b7eacb0c81ed06f95004c0f6d8
\ No newline at end of file

diff --git a/src/os.h b/src/os.h
index d2d8d24eb6155562ef789d3022e1e62e1ebe5662..d1395841d2f6438a6dd08ba033b568fe3dfb80af 100644 (file)
--- a/src/os.h
+++ b/src/os.h
@@ -39,7 +39,9 @@
 */
 #ifndef SQLITE_DISABLE_LFS
 # define _LARGE_FILE       1
-# define _FILE_OFFSET_BITS 64
+# ifndef _FILE_OFFSET_BITS
+#   define _FILE_OFFSET_BITS 64
+# endif
 # define _LARGEFILE_SOURCE 1
 #endif