Define an UNUSED macro for __attribute((unused))__.

diff --git a/ChangeLog b/ChangeLog
index 753ff5e2b928e37382cb46a1909fc73620fdd466..3502739856f79c91e22923f520959890a2720078 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 19 02:31:11 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * config.h.bot, configure.in, optlib/getopt.c: Define an UNUSED macro,
+    for __attribute__((unused)).
+
 Sun May 19 02:31:11 CDT 2002 Adam Heath <doogie@debian.org>
 
   * optlib/error.h, optlib/getopt.c, utils/start-stop-daemon.c: Use

diff --git a/config.h.bot b/config.h.bot
index 305be8662c4230952a2bb6a56026b8e83a01f0eb..5f68445b2dd6339d37349bdc905067946de826d4 100644 (file)
--- a/config.h.bot
+++ b/config.h.bot
@@ -78,6 +78,18 @@
 #define CONSTANT FUNCATTR((ATTRCONST))
 #endif
 
+/* GNU C unused functions, or null. */
+#ifndef ATTRUNUSED
+#ifdef HAVE_GNUC25_UNUSED
+#define ATTRUNUSED
+#else
+#define ATTRUNUSED
+#endif
+#endif
+#ifndef UNUSED
+#define UNUSED FUNCATTR((ATTRUNUSED))
+#endif
+
 /* Declare strerror if we don't have it already. */
 #ifndef HAVE_STRERROR
 const char *strerror(int);

diff --git a/configure.in b/configure.in
index fa8883b5449021187d46d3691c8e6fd2f164b4ed..bfb36832a381c9fab9daa911a21a10fae85b6d4d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -203,6 +203,11 @@ DPKG_CACHED_TRY_COMPILE(__attribute__((,,)),dpkg_cv_c_attribute_supported,,
    AC_MSG_RESULT(yes)
    AC_DEFINE(HAVE_GNUC25_CONST),
    AC_MSG_RESULT(no))
+  DPKG_CACHED_TRY_COMPILE(__attribute__((unused)),dpkg_cv_c_attribute_unused,,
+   [extern int testfunction(int x) __attribute__((unused))],
+   AC_MSG_RESULT(yes)
+   AC_DEFINE(HAVE_GNUC25_UNUSED),
+   AC_MSG_RESULT(no))
   DPKG_CACHED_TRY_COMPILE(__attribute__((format...)),dpkg_cv_attribute_format,,
    [extern int testfunction(char *y, ...) __attribute__((format(printf,1,2)))],
    AC_MSG_RESULT(yes)

diff --git a/optlib/getopt.c b/optlib/getopt.c
index 900ae92298dc6f77fec478e2a36e2cdce3a7042a..ea2d1ff5770706dd92b64c7acf22b2a11025f40b 100644 (file)
--- 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
-FUNCATTR(unused)
+UNUSED
 store_args_and_env (int argc, char *const *argv)
 {
   /* XXX This is no good solution.  We should rather copy the args so