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 01d4af7..a05b8f2 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 1b3d550..98b86b0 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 a5c40aa..50293b8 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 1cee34b..5929864 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 2af8462..7b93cba 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 e6cee8b..d957024 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 167d16e..027834b 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 d41d59f..dcbff5b 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 5eba993..b3be1d5 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 9c3f4a2..b57bf56 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 a227155..89c33d4 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 2730f20..0466b59 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 c7cdbee..4037f93 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 492d226..4213320 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 3fce5c0..e6407ce 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 97492b9..e2b7ff4 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 87ea9e7..e9b4ae2 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 8619746..346cd11 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 9da3a95..3be458f 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 abb33f8..10b3a37 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