diff --git a/Makefile b/Makefile index 119bf3e9..94f1106e 100644 --- a/Makefile +++ b/Makefile @@ -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 501111c7..17d048cc 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 #include #include diff --git a/btrfs-convert.c b/btrfs-convert.c index bbd19bbc..da10ad66 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 diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index 4f71227c..a361bf46 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 #include #include diff --git a/btrfs-find-root.c b/btrfs-find-root.c index 6fa61cc1..35171078 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 #include #include diff --git a/btrfs-fragments.c b/btrfs-fragments.c index 360f10f8..d742f605 100644 --- a/btrfs-fragments.c +++ b/btrfs-fragments.c @@ -14,7 +14,6 @@ * Boston, MA 021110-1307, USA. */ -#define _GNU_SOURCE #include #include #include diff --git a/btrfs-image.c b/btrfs-image.c index 1341bf1f..6a37fd93 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 #include #include diff --git a/btrfs-list.c b/btrfs-list.c index 50edcf49..3e29cf80 100644 --- a/btrfs-list.c +++ b/btrfs-list.c @@ -16,7 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _GNU_SOURCE #include #include #include "ioctl.h" diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c index b99d3bfb..0612c68b 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 #include #include diff --git a/btrfs-select-super.c b/btrfs-select-super.c index 6231d421..063ffa37 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 #include #include diff --git a/btrfs-show-super.c b/btrfs-show-super.c index 2b48f44f..4afa8527 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 #include #include diff --git a/btrfs-zero-log.c b/btrfs-zero-log.c index 41541752..31e7481f 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 #include #include diff --git a/btrfs.c b/btrfs.c index e83349cb..24518855 100644 --- a/btrfs.c +++ b/btrfs.c @@ -14,7 +14,6 @@ * Boston, MA 021110-1307, USA. */ -#define _GNU_SOURCE #include #include #include diff --git a/btrfstune.c b/btrfstune.c index 075fbc63..ac9f3110 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 #include #include diff --git a/chunk-recover.c b/chunk-recover.c index 381b596c..89219d2f 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 #include diff --git a/cmds-check.c b/cmds-check.c index a2e8ebeb..8000f15b 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 #include #include diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 528fda37..9aa57146 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -14,7 +14,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 #include #include #include diff --git a/cmds-receive.c b/cmds-receive.c index bffc7dc7..a1c72f97 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 diff --git a/cmds-restore.c b/cmds-restore.c index a07e61a1..d2fc9517 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 9b32c1f0..e59ba506 100644 --- a/cmds-send.c +++ b/cmds-send.c @@ -16,7 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _GNU_SOURCE #include "kerncompat.h" diff --git a/disk-io.c b/disk-io.c index b853f66e..7f037907 100644 --- a/disk-io.c +++ b/disk-io.c @@ -16,9 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 600 -#define __USE_XOPEN2K -#define _GNU_SOURCE 1 #include #include #include diff --git a/extent_io.c b/extent_io.c index 9c982f9a..cd0efdd7 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 #include #include diff --git a/mkfs.c b/mkfs.c index 60027ffa..18c4cb00 100644 --- a/mkfs.c +++ b/mkfs.c @@ -16,9 +16,6 @@ * Boston, MA 021110-1307, USA. */ -#define _XOPEN_SOURCE 500 -#define _GNU_SOURCE - #include "kerncompat.h" #include diff --git a/send-test.c b/send-test.c index 0e804a24..af8229e3 100644 --- a/send-test.c +++ b/send-test.c @@ -21,8 +21,6 @@ * Boston, MA 021110-1307, USA. */ -#define _GNU_SOURCE - #include #include #include diff --git a/super-recover.c b/super-recover.c index adb2c442..197fc4bd 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 #include #include diff --git a/utils-lib.c b/utils-lib.c index 9d53c6e5..79ef35e3 100644 --- a/utils-lib.c +++ b/utils-lib.c @@ -1,5 +1,3 @@ -#define _GNU_SOURCE - #include "kerncompat.h" #include #include diff --git a/utils.c b/utils.c index 9b08144f..a818950f 100644 --- a/utils.c +++ b/utils.c @@ -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 #include #include diff --git a/volumes.c b/volumes.c index 5ba5db5d..16dbf642 100644 --- a/volumes.c +++ b/volumes.c @@ -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 #include #include