diff options
author | Dimitri John Ledkov <dimitri.j.ledkov@intel.com> | 2015-01-18 01:52:58 +0000 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2015-01-27 14:45:59 +0100 |
commit | e69e015634a28d15ec651a17f900016b7b18df8f (patch) | |
tree | 91fd39eb9cc9c1bddd29344ef6857f9cc7e110d6 | |
parent | 34c28896e87047d7888c407984598bdf861bbca1 (diff) | |
download | btrfs-progs-e69e015634a28d15ec651a17f900016b7b18df8f.tar.gz |
btrfs-progs: drop feature defines from C files, in favour of CFLAGS defines
glibc 2.10+ (5+ years old) enables all the desired features:
_XOPEN_SOURCE 700, __XOPEN2K8, POSIX_C_SOURCE, DEFAULT_SOURCE; with a
single _GNU_SOURCE define in the makefile alone. For portability to
other libc implementations (e.g. dietlibc) _XOPEN_SOURCE=700 is also
defined.
This also resolves Debian bug report filed by Michael Tautschnig -
"Inconsistent use of _XOPEN_SOURCE results in conflicting
declarations". Whilst I was not able to reproduce the results, the
reported fact is that _XOPEN_SOURCE set to 500 in one set of files
(e.g. cmds-filesystem.c) generates/defines different struct stat from
other files (cmds-replace.c).
This patch thus cleans up all feature defines, and sets them at a
consistent level.
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747969
Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | btrfs-calc-size.c | 2 | ||||
-rw-r--r-- | btrfs-convert.c | 3 | ||||
-rw-r--r-- | btrfs-corrupt-block.c | 2 | ||||
-rw-r--r-- | btrfs-find-root.c | 2 | ||||
-rw-r--r-- | btrfs-fragments.c | 1 | ||||
-rw-r--r-- | btrfs-image.c | 2 | ||||
-rw-r--r-- | btrfs-list.c | 1 | ||||
-rw-r--r-- | btrfs-map-logical.c | 2 | ||||
-rw-r--r-- | btrfs-select-super.c | 2 | ||||
-rw-r--r-- | btrfs-show-super.c | 2 | ||||
-rw-r--r-- | btrfs-zero-log.c | 2 | ||||
-rw-r--r-- | btrfs.c | 1 | ||||
-rw-r--r-- | btrfstune.c | 2 | ||||
-rw-r--r-- | chunk-recover.c | 2 | ||||
-rw-r--r-- | cmds-check.c | 2 | ||||
-rw-r--r-- | cmds-filesystem.c | 1 | ||||
-rw-r--r-- | cmds-receive.c | 5 | ||||
-rw-r--r-- | cmds-restore.c | 2 | ||||
-rw-r--r-- | cmds-send.c | 1 | ||||
-rw-r--r-- | disk-io.c | 3 | ||||
-rw-r--r-- | extent_io.c | 2 | ||||
-rw-r--r-- | mkfs.c | 3 | ||||
-rw-r--r-- | send-test.c | 2 | ||||
-rw-r--r-- | super-recover.c | 3 | ||||
-rw-r--r-- | utils-lib.c | 2 | ||||
-rw-r--r-- | utils.c | 4 | ||||
-rw-r--r-- | volumes.c | 2 |
28 files changed, 1 insertions, 59 deletions
@@ -4,7 +4,7 @@ export CC = gcc LN = ln AR = ar -AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 -DBTRFS_FLAT_INCLUDES -fno-strict-aliasing -fPIC +AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 -DBTRFS_FLAT_INCLUDES -D_XOPEN_SOURCE=700 -D_GNU_SOURCE -fno-strict-aliasing -fPIC CFLAGS = -g -O1 -fno-strict-aliasing LDFLAGS = -rdynamic objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \ diff --git a/btrfs-calc-size.c b/btrfs-calc-size.c index 501111c..17d048c 100644 --- a/btrfs-calc-size.c +++ b/btrfs-calc-size.c @@ -16,8 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE 1 #include <ctype.h> #include <stdio.h> #include <stdlib.h> diff --git a/btrfs-convert.c b/btrfs-convert.c index bbd19bb..da10ad6 100644 --- a/btrfs-convert.c +++ b/btrfs-convert.c @@ -16,9 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 600 -#define _GNU_SOURCE 1 - #include "kerncompat.h" #include <sys/ioctl.h> diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index 4f71227..a361bf4 100644 --- a/btrfs-corrupt-block.c +++ b/btrfs-corrupt-block.c @@ -16,8 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE 1 #include <stdio.h> #include <stdlib.h> #include <fcntl.h> diff --git a/btrfs-find-root.c b/btrfs-find-root.c index 6fa61cc..3517107 100644 --- a/btrfs-find-root.c +++ b/btrfs-find-root.c @@ -16,8 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE 1 #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/btrfs-fragments.c b/btrfs-fragments.c index 360f10f..d742f60 100644 --- a/btrfs-fragments.c +++ b/btrfs-fragments.c @@ -14,7 +14,6 @@ * Boston, MA 021110-1307, USA. */ -#define _GNU_SOURCE #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/btrfs-image.c b/btrfs-image.c index 1341bf1..6a37fd9 100644 --- a/btrfs-image.c +++ b/btrfs-image.c @@ -16,8 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE 1 #include <pthread.h> #include <stdio.h> #include <stdlib.h> diff --git a/btrfs-list.c b/btrfs-list.c index 50edcf4..3e29cf8 100644 --- a/btrfs-list.c +++ b/btrfs-list.c @@ -16,7 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _GNU_SOURCE #include <sys/ioctl.h> #include <sys/mount.h> #include "ioctl.h" diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c index b99d3bf..0612c68 100644 --- a/btrfs-map-logical.c +++ b/btrfs-map-logical.c @@ -16,8 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE 1 #include <stdio.h> #include <stdlib.h> #include <fcntl.h> diff --git a/btrfs-select-super.c b/btrfs-select-super.c index 6231d42..063ffa3 100644 --- a/btrfs-select-super.c +++ b/btrfs-select-super.c @@ -16,8 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE 1 #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/btrfs-show-super.c b/btrfs-show-super.c index 2b48f44..4afa852 100644 --- a/btrfs-show-super.c +++ b/btrfs-show-super.c @@ -16,8 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE 1 #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/btrfs-zero-log.c b/btrfs-zero-log.c index 4154175..31e7481 100644 --- a/btrfs-zero-log.c +++ b/btrfs-zero-log.c @@ -16,8 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE 1 #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -14,7 +14,6 @@ * Boston, MA 021110-1307, USA. */ -#define _GNU_SOURCE #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/btrfstune.c b/btrfstune.c index 075fbc6..ac9f311 100644 --- a/btrfstune.c +++ b/btrfstune.c @@ -16,8 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE 1 #include <stdio.h> #include <stdlib.h> #include <sys/types.h> diff --git a/chunk-recover.c b/chunk-recover.c index 381b596..89219d2 100644 --- a/chunk-recover.c +++ b/chunk-recover.c @@ -15,8 +15,6 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE #include <stdio.h> #include <stdio_ext.h> diff --git a/cmds-check.c b/cmds-check.c index a2e8ebe..8000f15 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -16,8 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE 1 #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 528fda3..9aa5714 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -14,7 +14,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/cmds-receive.c b/cmds-receive.c index bffc7dc..a1c72f9 100644 --- a/cmds-receive.c +++ b/cmds-receive.c @@ -16,11 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _GNU_SOURCE -#define _POSIX_C_SOURCE 200809 -#define _XOPEN_SOURCE 700 -#define _DEFAULT_SOURCE - #include "kerncompat.h" #include <unistd.h> diff --git a/cmds-restore.c b/cmds-restore.c index a07e61a..d2fc951 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -16,8 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE 1 #include "kerncompat.h" diff --git a/cmds-send.c b/cmds-send.c index 9b32c1f..e59ba50 100644 --- a/cmds-send.c +++ b/cmds-send.c @@ -16,7 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _GNU_SOURCE #include "kerncompat.h" @@ -16,9 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 600 -#define __USE_XOPEN2K -#define _GNU_SOURCE 1 #include <stdio.h> #include <stdlib.h> #include <sys/types.h> diff --git a/extent_io.c b/extent_io.c index 9c982f9..cd0efdd 100644 --- a/extent_io.c +++ b/extent_io.c @@ -16,8 +16,6 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 600 -#define __USE_XOPEN2K #include <stdio.h> #include <stdlib.h> #include <sys/types.h> @@ -16,9 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE - #include "kerncompat.h" #include <sys/ioctl.h> diff --git a/send-test.c b/send-test.c index 0e804a2..af8229e 100644 --- a/send-test.c +++ b/send-test.c @@ -21,8 +21,6 @@ * Boston, MA 021110-1307, USA. */ -#define _GNU_SOURCE - #include <unistd.h> #include <stdint.h> #include <dirent.h> diff --git a/super-recover.c b/super-recover.c index adb2c44..197fc4b 100644 --- a/super-recover.c +++ b/super-recover.c @@ -16,9 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE 1 - #include <stdio.h> #include <stdlib.h> #include <fcntl.h> diff --git a/utils-lib.c b/utils-lib.c index 9d53c6e..79ef35e 100644 --- a/utils-lib.c +++ b/utils-lib.c @@ -1,5 +1,3 @@ -#define _GNU_SOURCE - #include "kerncompat.h" #include <unistd.h> #include <stdlib.h> @@ -17,10 +17,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 700 -#define __USE_XOPEN2K8 -#define __XOPEN2K8 /* due to an error in dirent.h, to get dirfd() */ -#define _GNU_SOURCE /* O_NOATIME */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -15,8 +15,6 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 600 -#define __USE_XOPEN2K #include <stdio.h> #include <stdlib.h> #include <sys/types.h> |