Move GNU C attribute definitions to lib/dpkg-def.h

diff --git a/ChangeLog b/ChangeLog
index c5656bf8b8dd05e995d516406a909a6a7fb3813e..21b307444050c022efd85185a84e4294008b5b07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-11  Guillem Jover  <guillem@debian.org>
+
+       * lib/Makefile.am (libdpkg_a_SOURCES): Add 'dpkg-def.h'.
+       * lib/dpkg.h: Include 'dpkg-def.h'.
+       (CONSTANT, PRINTFFORMAT, NONRETURNING, UNUSED): Move defninitions
+       to ...
+       * lib/dpkg-def.h: ... here. New file.
+       * utils/start-stop-daemon.c: Include 'dpkg-def.h'.
+       (CONSTANT, PRINTFFORMAT, NONRETURNING, UNUSED): Remove defninitions.
+
 2008-03-11  Ian Jackson  <ian@davenant.greenend.org.uk>
 
        * lib/dpkg.h (fgets_checked, fgets_must): New function declarations.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9a99004c06756b53963163ae5a241cdfcf1ac044..a5a3ac92fed514b0b41ab38d02be57b87e856612 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,6 +12,7 @@ INCLUDES = \
 noinst_LIBRARIES = libdpkg.a
 
 libdpkg_a_SOURCES = \
+       dpkg-def.h \
        dpkg.h \
        dpkg-db.h \
        compat.c \

diff --git a/lib/dpkg-def.h b/lib/dpkg-def.h
new file mode 100644 (file)
index 0000000..08e01cb
--- /dev/null
+++ b/lib/dpkg-def.h
@@ -0,0 +1,39 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * dpkg-def.h - C language support definitions
+ *
+ * Copyright (C) 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with dpkg; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef DPKG_DEF_H
+#define DPKG_DEF_H
+
+#include <config.h>
+
+#if HAVE_C_ATTRIBUTE
+# define CONSTANT __attribute__((constant))
+# define PRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc)))
+# define NONRETURNING __attribute__((noreturn))
+# define UNUSED __attribute__((unused))
+#else
+# define CONSTANT
+# define PRINTFFORMAT(si, tc)
+# define NONRETURNING
+# define UNUSED
+#endif
+
+#endif

diff --git a/lib/dpkg.h b/lib/dpkg.h
index edb40098f7437d5a4d714f3353779baf7741fed1..60c050052ae14d12c42411d2e1ab5113194c7291 100644 (file)
--- a/lib/dpkg.h
+++ b/lib/dpkg.h
@@ -30,6 +30,8 @@
 
 #include <myopt.h>
 
+#include <dpkg-def.h>
+
 #ifdef HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
@@ -154,18 +156,6 @@
 extern const char thisname[]; /* defined separately in each program */
 extern const char printforhelp[];
 
-#if HAVE_C_ATTRIBUTE
-# define CONSTANT __attribute__((constant))
-# define PRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc)))
-# define NONRETURNING __attribute__((noreturn))
-# define UNUSED __attribute__((unused))
-#else
-# define CONSTANT
-# define PRINTFFORMAT(si, tc)
-# define NONRETURNING
-# define UNUSED
-#endif
-
 /*** from startup.c ***/
 
 #define standard_startup(ejbuf, argc, argv, prog, loadcfg, cmdinfos) do {\

diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 610816317fdb72f17f955703720510ca5f70ba89..af534ddd96d0081fd3a3e3c541a8db191a99bc8d 100644 (file)
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <dpkg-def.h>
+
 #if defined(linux) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
 #  define OSLinux
 #elif defined(__GNU__)
@@ -101,18 +103,6 @@
 #include <error.h>
 #endif
 
-#if HAVE_C_ATTRIBUTE
-# define CONSTANT __attribute__((constant))
-# define PRINTFFORMAT(si, tc) __attribute__((format(printf, si, tc)))
-# define NONRETURNING __attribute__((noreturn))
-# define UNUSED __attribute__((unused))
-#else
-# define CONSTANT
-# define PRINTFFORMAT(si, tc)
-# define NONRETURNING
-# define UNUSED
-#endif
-
 static int testmode = 0;
 static int quietmode = 0;
 static int exitnodo = 1;