xattr: fix check for simultaneous glibc header inclusion
authorFilipe Brandenburger <[email protected]>
Fri, 29 Aug 2014 22:18:51 +0000 (15:18 -0700)
committerLinus Torvalds <[email protected]>
Fri, 29 Aug 2014 23:28:16 +0000 (16:28 -0700)
commitbfcfd44cce2774f19daeb59fb4e43fc9aa80e7b8
treeae5e2b5cf2005542e091b17425fa922daf886c39
parentb41d34b46aa91e0c83300c38eebc0b8762705e82
xattr: fix check for simultaneous glibc header inclusion

The guard was introduced in commit ea1a8217b06b ("xattr: guard against
simultaneous glibc header inclusion") but it is using #ifdef to check
for a define that is either set to 1 or 0.  Fix it to use #if instead.

* Without this patch:

  $ { echo "#include <sys/xattr.h>"; echo "#include <linux/xattr.h>"; } | gcc -E -Iinclude/uapi - >/dev/null
  include/uapi/linux/xattr.h:19:0: warning: "XATTR_CREATE" redefined [enabled by default]
   #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */
   ^
  /usr/include/x86_64-linux-gnu/sys/xattr.h:32:0: note: this is the location of the previous definition
   #define XATTR_CREATE XATTR_CREATE
   ^

* With this patch:

  $ { echo "#include <sys/xattr.h>"; echo "#include <linux/xattr.h>"; } | gcc -E -Iinclude/uapi - >/dev/null
  (no warnings)

Signed-off-by: Filipe Brandenburger <[email protected]>
Acked-by: Serge E. Hallyn <[email protected]>
Cc: Allan McRae <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
include/uapi/linux/xattr.h