diff options
| -rw-r--r-- | include/nl_types.h | 3 | ||||
| -rw-r--r-- | include/stdio.h | 7 | ||||
| -rw-r--r-- | sys/sys/cdefs.h | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/include/nl_types.h b/include/nl_types.h index 349fd77..e386568 100644 --- a/include/nl_types.h +++ b/include/nl_types.h @@ -97,8 +97,7 @@ typedef __nl_item nl_item; __BEGIN_DECLS nl_catd catopen(const char *, int); -char *catgets(nl_catd, int, int, const char *) - __attribute__((__format_arg__(4))); +char *catgets(nl_catd, int, int, const char *) __format_arg(4); int catclose(nl_catd); __END_DECLS diff --git a/include/stdio.h b/include/stdio.h index 8ff084d..d25f02c 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -328,12 +328,7 @@ char *tempnam(const char *, const char *); int asprintf(char **, const char *, ...) __printflike(2, 3); char *ctermid_r(char *); char *fgetln(FILE *, size_t *); -#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3 -#define __ATTR_FORMAT_ARG __attribute__((__format_arg__(2))) -#else -#define __ATTR_FORMAT_ARG -#endif -__const char *fmtcheck(const char *, const char *) __ATTR_FORMAT_ARG; +__const char *fmtcheck(const char *, const char *) __format_arg(2); int fpurge(FILE *); void setbuffer(FILE *, char *, int); int setlinebuf(FILE *); diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 36047fb..5fe46e6 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -324,11 +324,13 @@ #if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER) #define __printflike(fmtarg, firstvararg) #define __scanflike(fmtarg, firstvararg) +#define __format_arg(fmtarg) #else #define __printflike(fmtarg, firstvararg) \ __attribute__((__format__ (__printf__, fmtarg, firstvararg))) #define __scanflike(fmtarg, firstvararg) \ __attribute__((__format__ (__scanf__, fmtarg, firstvararg))) +#define __format_arg(fmtarg) __attribute__((__format_arg__ (fmtarg))) #endif /* Compiler-dependent macros that rely on FreeBSD-specific extensions. */ |
