From 526dfeadb75f305f336f962125cca0d8be8fc9b5 Mon Sep 17 00:00:00 2001 From: Adam Heath Date: Sun, 19 May 2002 07:35:12 +0000 Subject: [PATCH] Use the configure detected gcc __attribute__ macros, instead of hard-coding them. --- ChangeLog | 6 ++++++ optlib/error.h | 17 ++--------------- optlib/getopt.c | 2 +- utils/start-stop-daemon.c | 4 ++-- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf733384..753ff5e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun May 19 02:31:11 CDT 2002 Adam Heath + + * optlib/error.h, optlib/getopt.c, utils/start-stop-daemon.c: Use + the configure detected gcc __attribute__ macros, instead of + hard-coding them. + Thu May 16 19:09:48 CEST 2002 Wichert Akkerman * po/da.po: New version from Claus Hindsgaul diff --git a/optlib/error.h b/optlib/error.h index 74c0ad1c..d816fde1 100644 --- a/optlib/error.h +++ b/optlib/error.h @@ -22,19 +22,6 @@ #ifndef _ERROR_H #define _ERROR_H 1 -#ifndef __attribute__ -/* This feature is available in gcc versions 2.5 and later. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ -# define __attribute__(Spec) /* empty */ -# endif -/* The __-protected variants of `format' and `printf' attributes - are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) -# define __format__ format -# define __printf__ printf -# endif -#endif - #ifdef __cplusplus extern "C" { #endif @@ -46,11 +33,11 @@ extern "C" { If STATUS is nonzero, terminate the program with `exit (STATUS)'. */ extern void error (int status, int errnum, const char *format, ...) - __attribute__ ((__format__ (__printf__, 3, 4))); + PRINTFFORMAT(3, 4); extern void error_at_line (int status, int errnum, const char *fname, unsigned int lineno, const char *format, ...) - __attribute__ ((__format__ (__printf__, 5, 6))); + PRINTFFORMAT(5, 6); /* If NULL, error will flush stdout, then print on stderr the program name, a colon and a space. Otherwise, error will call this diff --git a/optlib/getopt.c b/optlib/getopt.c index 23393ff0..900ae922 100644 --- a/optlib/getopt.c +++ b/optlib/getopt.c @@ -270,7 +270,7 @@ extern pid_t __libc_pid; is valid for the getopt call we must make sure that the ARGV passed to getopt is that one passed to the process. */ static void -__attribute__ ((unused)) +FUNCATTR(unused) store_args_and_env (int argc, char *const *argv) { /* XXX This is no good solution. We should rather copy the args so diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index 1048f08f..b8295349 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -156,9 +156,9 @@ static int pid_is_exec(pid_t pid, const struct stat *esb); #ifdef __GNUC__ static void fatal(const char *format, ...) - __attribute__((noreturn, format(printf, 1, 2))); + NONRETURNPRINTFFORMAT(1, 2); static void badusage(const char *msg) - __attribute__((noreturn)); + NONRETURNING; #else static void fatal(const char *format, ...); static void badusage(const char *msg); -- 2.39.5