marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
master
Dimitri John Ledkov 2015-01-18 01:52:58 +00:00 committed by David Sterba
parent 34c28896e8
commit e69e015634
28 changed files with 1 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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 \

2
btrfs-calc-size.c
View File

@ -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>

3
btrfs-convert.c
View File

@ -16,9 +16,6 @@
* Boston, MA 021110-1307, USA.
*/
#define _XOPEN_SOURCE 600
#define _GNU_SOURCE 1
#include "kerncompat.h"
#include <sys/ioctl.h>

2
btrfs-corrupt-block.c
View File

@ -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>

2
btrfs-find-root.c
View File

@ -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>

1
btrfs-fragments.c
View File

@ -14,7 +14,6 @@
* Boston, MA 021110-1307, USA.
*/
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

2
btrfs-image.c
View File

@ -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>

1
btrfs-list.c
View File

@ -16,7 +16,6 @@
* Boston, MA 021110-1307, USA.
*/
#define _GNU_SOURCE
#include <sys/ioctl.h>
#include <sys/mount.h>
#include "ioctl.h"

2
btrfs-map-logical.c
View File

@ -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>

2
btrfs-select-super.c
View File

@ -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>

2
btrfs-show-super.c
View File

@ -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>

2
btrfs-zero-log.c
View File

@ -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>

1
btrfs.c
View File

@ -14,7 +14,6 @@
* Boston, MA 021110-1307, USA.
*/
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

2
btrfstune.c
View File

@ -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>

2
chunk-recover.c
View File

@ -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>

2
cmds-check.c
View File

@ -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>

1
cmds-filesystem.c
View File

@ -14,7 +14,6 @@
* Boston, MA 021110-1307, USA.
*/
#define _XOPEN_SOURCE 500
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

5
cmds-receive.c
View File

@ -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>

2
cmds-restore.c
View File

@ -16,8 +16,6 @@
* Boston, MA 021110-1307, USA.
*/
#define _XOPEN_SOURCE 500
#define _GNU_SOURCE 1
#include "kerncompat.h"

1
cmds-send.c
View File

@ -16,7 +16,6 @@
* Boston, MA 021110-1307, USA.
*/
#define _GNU_SOURCE
#include "kerncompat.h"

3
disk-io.c
View File

@ -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>

2
extent_io.c
View File

@ -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>

3
mkfs.c
View File

@ -16,9 +16,6 @@
* Boston, MA 021110-1307, USA.
*/
#define _XOPEN_SOURCE 500
#define _GNU_SOURCE
#include "kerncompat.h"
#include <sys/ioctl.h>

2
send-test.c
View File

@ -21,8 +21,6 @@
* Boston, MA 021110-1307, USA.
*/
#define _GNU_SOURCE
#include <unistd.h>
#include <stdint.h>
#include <dirent.h>

3
super-recover.c
View File

@ -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>

2
utils-lib.c
View File

@ -1,5 +1,3 @@
#define _GNU_SOURCE
#include "kerncompat.h"
#include <unistd.h>
#include <stdlib.h>

4
utils.c
View File

@ -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>

2
volumes.c
View File

@ -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>