Eliminate doubly defined _LARGEFILE_SOURCE warning

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/contrib/fallocate.c b/contrib/fallocate.c
index 01d4af7d05c8f02e984909b55cb3472ba3c5da31..a05b8f2ed0a60a95cfe6a5e48ce4258a798d1bc2 100644 (file)
--- a/contrib/fallocate.c
+++ b/contrib/fallocate.c
@@ -21,8 +21,12 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include <sys/stat.h>
 #include <sys/syscall.h>

diff --git a/contrib/make-sparse.c b/contrib/make-sparse.c
index 1b3d5506d79faa5d3eaeabd7866b6850d1d9ceeb..98b86b06690d4a5d55e29062040e4a5dbfa424d9 100644 (file)
--- a/contrib/make-sparse.c
+++ b/contrib/make-sparse.c
@@ -9,8 +9,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include <stdio.h>
 #include <unistd.h>

diff --git a/lib/blkid/getsize.c b/lib/blkid/getsize.c
index a5c40aa9d666d5b2e7a9721d14993c29d53070d6..50293b828f07a971097e10275328ef62c218afbf 100644 (file)
--- a/lib/blkid/getsize.c
+++ b/lib/blkid/getsize.c
@@ -9,8 +9,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #include "blkidP.h"

diff --git a/lib/blkid/llseek.c b/lib/blkid/llseek.c
index 1cee34b41a462a08d60b50131dac25bd887fe91b..59298646fd3611725765104d3a0a4862ab6f63dc 100644 (file)
--- a/lib/blkid/llseek.c
+++ b/lib/blkid/llseek.c
@@ -9,8 +9,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #if HAVE_SYS_TYPES_H

diff --git a/lib/e2p/fgetflags.c b/lib/e2p/fgetflags.c
index 2af84627b7ad79f39dc36ece8bd790b7bd5b5c83..7b93cbae376a4121a6f49a1eaeb57ecf8ef37854 100644 (file)
--- a/lib/e2p/fgetflags.c
+++ b/lib/e2p/fgetflags.c
@@ -16,8 +16,12 @@
  * 93/10/30    - Creation
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #if HAVE_ERRNO_H

diff --git a/lib/e2p/fgetversion.c b/lib/e2p/fgetversion.c
index e6cee8bf2bad3ab68b2dc04b63e0b588420f5371..d95702489c4b40092cfb80b73ab1a291273b3efc 100644 (file)
--- a/lib/e2p/fgetversion.c
+++ b/lib/e2p/fgetversion.c
@@ -16,8 +16,12 @@
  * 93/10/30    - Creation
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #if HAVE_ERRNO_H

diff --git a/lib/e2p/fsetflags.c b/lib/e2p/fsetflags.c
index 167d16e86faa361da512aa364cc2e80e21bced8f..027834b96941c1929030b56f463df6e9a44e4c66 100644 (file)
--- a/lib/e2p/fsetflags.c
+++ b/lib/e2p/fsetflags.c
@@ -16,8 +16,12 @@
  * 93/10/30    - Creation
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #if HAVE_ERRNO_H

diff --git a/lib/e2p/fsetversion.c b/lib/e2p/fsetversion.c
index d41d59f9eee6110c8fd512b1530249a7fe57b445..dcbff5b9250364a416408c3ec70b3e8d3c16551d 100644 (file)
--- a/lib/e2p/fsetversion.c
+++ b/lib/e2p/fsetversion.c
@@ -16,8 +16,12 @@
  * 93/10/30    - Creation
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #if HAVE_ERRNO_H

diff --git a/lib/ext2fs/atexit.c b/lib/ext2fs/atexit.c
index 5eba993af5e09381a0a7af2217680bd79d0e610c..b3be1d5ba52f35e9f41d40350ad9d0092f05864c 100644 (file)
--- a/lib/ext2fs/atexit.c
+++ b/lib/ext2fs/atexit.c
@@ -10,8 +10,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #include <stdlib.h>

diff --git a/lib/ext2fs/getsectsize.c b/lib/ext2fs/getsectsize.c
index 9c3f4a2e5327b633e9ce3e9692187d4974c0e86c..b57bf56a5eef1cdf420b3e8c60a65215db1a7530 100644 (file)
--- a/lib/ext2fs/getsectsize.c
+++ b/lib/ext2fs/getsectsize.c
@@ -10,8 +10,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #include <stdio.h>

diff --git a/lib/ext2fs/getsize.c b/lib/ext2fs/getsize.c
index a227155e0221b7af047e7ef100f3dbd06eefedf2..89c33d4cdcdc1675bfe248d66377cf810a5cd06d 100644 (file)
--- a/lib/ext2fs/getsize.c
+++ b/lib/ext2fs/getsize.c
@@ -12,8 +12,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #include <stdio.h>

diff --git a/lib/ext2fs/llseek.c b/lib/ext2fs/llseek.c
index 2730f20be3512bab9ddb97531fde5a146cd6e7ab..0466b5953372ac172e3ee96aa938f98f45639ef5 100644 (file)
--- a/lib/ext2fs/llseek.c
+++ b/lib/ext2fs/llseek.c
@@ -9,8 +9,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #if HAVE_SYS_TYPES_H

diff --git a/lib/ext2fs/qcow2.c b/lib/ext2fs/qcow2.c
index c7cdbee8988f7cb2be433427904e216da3a19b6c..4037f9341534b5d6fb002e0fed0f14adf9a59834 100644 (file)
--- a/lib/ext2fs/qcow2.c
+++ b/lib/ext2fs/qcow2.c
@@ -23,8 +23,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #include <fcntl.h>

diff --git a/lib/ext2fs/undo_io.c b/lib/ext2fs/undo_io.c
index 492d22678b9dc4167d60e3b3234bf254567da369..42133208403338cb4bf2c98be4ed754adaf8e225 100644 (file)
--- a/lib/ext2fs/undo_io.c
+++ b/lib/ext2fs/undo_io.c
@@ -11,8 +11,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #include <stdio.h>

diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
index 3fce5c0142c27ad3ab1dc5abfb50b069cdf59e64..e6407ce2e0fde49d336ea67d8bd2ddd4edf8ec33 100644 (file)
--- a/lib/ext2fs/unix_io.c
+++ b/lib/ext2fs/unix_io.c
@@ -18,8 +18,12 @@
 #define _XOPEN_SOURCE 600
 #define _DARWIN_C_SOURCE
 #define _FILE_OFFSET_BITS 64
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif

diff --git a/lib/support/plausible.c b/lib/support/plausible.c
index 97492b9c184087956345a12ce5dbf5d30c3e99a3..e2b7ff4a698d2dd4ff2f7189c79c4250edb609ed 100644 (file)
--- a/lib/support/plausible.c
+++ b/lib/support/plausible.c
@@ -12,8 +12,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #include <fcntl.h>

diff --git a/misc/e2image.c b/misc/e2image.c
index 87ea9e7554347a7d4461313804973d53b2c69194..e9b4ae26a8bb88dd4f826573d643cf97d5cd415d 100644 (file)
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -10,8 +10,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #include <fcntl.h>

diff --git a/misc/util.c b/misc/util.c
index 86197460bf6c6a0f752f8983f8c8f9d7dc07253b..346cd1114cc447e6885879c25c5eb8091114c070 100644 (file)
--- a/misc/util.c
+++ b/misc/util.c
@@ -9,8 +9,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #include <fcntl.h>

diff --git a/resize/main.c b/resize/main.c
index 9da3a958cc01379c7ed204840518f73e070a1abb..3be458f027c33bb58639d9d7d9b4851c20bf18ba 100644 (file)
--- a/resize/main.c
+++ b/resize/main.c
@@ -12,8 +12,12 @@
  * %End-Header%
  */
 
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include "config.h"
 #ifdef HAVE_GETOPT_H

diff --git a/util/symlinks.c b/util/symlinks.c
index abb33f8b230b3e86689d8ac9691525ca0f199bd9..10b3a37443f529f3c8ac4a1f7a2ec91277d89d83 100644 (file)
--- a/util/symlinks.c
+++ b/util/symlinks.c
@@ -1,6 +1,10 @@
 #define _FILE_OFFSET_BITS 64
+#ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
+#endif
 
 #include <unistd.h>
 #ifndef _POSIX_SOURCE