From: Theodore Ts'o Date: Mon, 13 Jul 2015 02:54:37 +0000 (-0400) Subject: Eliminate doubly defined _LARGEFILE_SOURCE warning X-Git-Tag: v1.43-WIP-2016-03-15~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1644c324bd6bc0ed8f48275d64ccde4ce13a044;p=thirdparty%2Fe2fsprogs.git Eliminate doubly defined _LARGEFILE_SOURCE warning Signed-off-by: Theodore Ts'o --- diff --git a/contrib/fallocate.c b/contrib/fallocate.c index 01d4af7d0..a05b8f2ed 100644 --- 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 #include diff --git a/contrib/make-sparse.c b/contrib/make-sparse.c index 1b3d5506d..98b86b066 100644 --- 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 #include diff --git a/lib/blkid/getsize.c b/lib/blkid/getsize.c index a5c40aa9d..50293b828 100644 --- 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 1cee34b41..59298646f 100644 --- 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 2af84627b..7b93cbae3 100644 --- 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 e6cee8bf2..d95702489 100644 --- 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 167d16e86..027834b96 100644 --- 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 d41d59f9e..dcbff5b92 100644 --- 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 5eba993af..b3be1d5ba 100644 --- 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 diff --git a/lib/ext2fs/getsectsize.c b/lib/ext2fs/getsectsize.c index 9c3f4a2e5..b57bf56a5 100644 --- 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 diff --git a/lib/ext2fs/getsize.c b/lib/ext2fs/getsize.c index a227155e0..89c33d4cd 100644 --- 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 diff --git a/lib/ext2fs/llseek.c b/lib/ext2fs/llseek.c index 2730f20be..0466b5953 100644 --- 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 c7cdbee89..4037f9341 100644 --- 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 diff --git a/lib/ext2fs/undo_io.c b/lib/ext2fs/undo_io.c index 492d22678..421332084 100644 --- 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 diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c index 3fce5c014..e6407ce2e 100644 --- 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 97492b9c1..e2b7ff4a6 100644 --- 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 diff --git a/misc/e2image.c b/misc/e2image.c index 87ea9e755..e9b4ae26a 100644 --- 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 diff --git a/misc/util.c b/misc/util.c index 86197460b..346cd1114 100644 --- 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 diff --git a/resize/main.c b/resize/main.c index 9da3a958c..3be458f02 100644 --- 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 abb33f8b2..10b3a3744 100644 --- 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 #ifndef _POSIX_SOURCE