From: drh <drh@noemail.net>
Date: Fri, 7 Feb 2014 19:33:31 +0000 (+0000)
Subject: Fix redundant definitions of _LARGE_FILE and _LARGEFILE_SOURCE.
X-Git-Tag: version-3.8.4~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dddf6978d21314e1835630f0e02c65fc231dbec9;p=thirdparty%2Fsqlite.git

Fix redundant definitions of _LARGE_FILE and _LARGEFILE_SOURCE.

FossilOrigin-Name: 4043d879795bfad55af35e9cb48e0a42eb4087ae
---

diff --git a/manifest b/manifest
index 700f104ff6..18259af769 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sTCL\sbindings,\smake\ssure\sTcl_AppendResult()\sis\salways\sterminated\nby\s"(char*)0"\sand\snot\sjust\s"0".
-D 2014-02-07T19:26:13.604
+C Fix\sredundant\sdefinitions\sof\s_LARGE_FILE\sand\s_LARGEFILE_SOURCE.
+D 2014-02-07T19:33:31.352
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -205,7 +205,7 @@ F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
-F src/os_unix.c f3ed0e406cbf9c820565b2118232d0796346130f
+F src/os_unix.c 18f7f95dc6bcb9cf4d4a238d8e2de96611bc2ae5
 F src/os_win.c d4284f003445054a26689f1264b1b9bf7261bd1b
 F src/pager.c efa923693e958696eee69b205a20bfbc402c8480
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
@@ -224,7 +224,7 @@ F src/shell.c 7dedf7367ee49050b0366bf8dbc8ec2bd15b42c7
 F src/sqlite.h.in eed7f7d66a60daaa7b4a597dcd9bad87aad9611b
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
-F src/sqliteInt.h fdab572b3567d587cf3096e3ca5dabcedda3fa66
+F src/sqliteInt.h d3dd8e370f0c4e72a612c71c9b4255fee44806c8
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -1152,7 +1152,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P be24fbc22106e508975e316abe0471edd3833291
-R 3b20a064262155765ddc1dcd7881cbe1
+P ea4d23d1c0df4fde2e532daa081888712f465884
+R fe35814af819067492f7e22674ab8b60
 U drh
-Z 32dadfb086ccda5c6d983ac169fd7f6c
+Z bbbf5c390e5238e969c1eb355ec42634
diff --git a/manifest.uuid b/manifest.uuid
index 4ba30ed9a5..c78d46e5f2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ea4d23d1c0df4fde2e532daa081888712f465884
\ No newline at end of file
+4043d879795bfad55af35e9cb48e0a42eb4087ae
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index b539550220..deb9e51d07 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -83,32 +83,6 @@
 #  endif
 #endif
 
-/*
-** These #defines should enable >2GB file support on Posix if the
-** underlying operating system supports it.  If the OS lacks
-** large file support, these should be no-ops.
-**
-** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch
-** on the compiler command line.  This is necessary if you are compiling
-** on a recent machine (ex: RedHat 7.2) but you want your code to work
-** on an older machine (ex: RedHat 6.0).  If you compile on RedHat 7.2
-** without this option, LFS is enable.  But LFS does not exist in the kernel
-** in RedHat 6.0, so the code won't work.  Hence, for maximum binary
-** portability you should omit LFS.
-**
-** The previous paragraph was written in 2005.  (This paragraph is written
-** on 2008-11-28.) These days, all Linux kernels support large files, so
-** you should probably leave LFS enabled.  But some embedded platforms might
-** lack LFS in which case the SQLITE_DISABLE_LFS macro might still be useful.
-*/
-#ifndef SQLITE_DISABLE_LFS
-# define _LARGE_FILE       1
-# ifndef _FILE_OFFSET_BITS
-#   define _FILE_OFFSET_BITS 64
-# endif
-# define _LARGEFILE_SOURCE 1
-#endif
-
 /*
 ** standard include files.
 */
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 7c5e1e3ed9..45a3986d8c 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -33,6 +33,11 @@
 ** in Red Hat 6.0, so the code won't work.  Hence, for maximum binary
 ** portability you should omit LFS.
 **
+** The previous paragraph was written in 2005.  (This paragraph is written
+** on 2008-11-28.) These days, all Linux kernels support large files, so
+** you should probably leave LFS enabled.  But some embedded platforms might
+** lack LFS in which case the SQLITE_DISABLE_LFS macro might still be useful.
+**
 ** Similar is true for Mac OS X.  LFS is only supported on Mac OS X 9 and later.
 */
 #ifndef SQLITE_DISABLE_LFS