From: Garrett Wollman Date: Thu, 11 Aug 2011 01:21:40 +0000 (-0400) Subject: stds.h: __nonnull__ has four underscores X-Git-Tag: upstream/1.8.0_pre1^2~3418 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=833010acac069c97f59c527e23eaa4b71ff18981;p=packages%2Fo%2Fopenafs.git stds.h: __nonnull__ has four underscores Compile-testing AFS_NONNULL doesn't prove anything until something actually uses it. Fix 342be3535499c5ecd7d34b4edd43a4655559cb28 to use the spelling that the compilers actually support. Change-Id: I4a6b965d459a90a1832f2e813e886c15d3477962 Reviewed-on: http://gerrit.openafs.org/5198 Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- diff --git a/src/config/stds.h b/src/config/stds.h index 53badff38..cf023d2b8 100644 --- a/src/config/stds.h +++ b/src/config/stds.h @@ -296,12 +296,12 @@ hdr_static_inline(unsigned long) afs_printable_uint32_lu(afs_uint32 d) { return #define AFS_UNUSED __attribute__((unused)) #define AFS_ATTRIBUTE_FORMAT(style,x,y) __attribute__((format(style, x, y))) #define AFS_NORETURN __attribute__((__noreturn__)) -#define AFS_NONNULL(x) __attribute__((__nonnull x)) +#define AFS_NONNULL(x) __attribute__((__nonnull__ x)) #elif defined (__clang__) #define AFS_UNUSED __attribute__((unused)) #define AFS_ATTRIBUTE_FORMAT(style,x,y) __attribute__((format(style, x, y))) #define AFS_NORETURN __attribute__((__noreturn__)) -#define AFS_NONNULL(x) __attribute__((__nonnull x)) +#define AFS_NONNULL(x) __attribute__((__nonnull__ x)) #else #define AFS_UNUSED #define AFS_ATTRIBUTE_FORMAT(style,x,y)