The following commit has been merged in the master branch:
commit a2ee76833ff14d56332b53b0a0462602265ba824
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Tue Mar 11 06:24:12 2008 +0200
Move GNU C attribute definitions to lib/dpkg-def.h
diff --git a/ChangeLog b/ChangeLog
index c5656bf..21b3074 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-11 Guillem Jover <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* lib/dpkg.h (fgets_checked, fgets_must): New function declarations.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9a99004..a5a3ac9 100644
--- 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/showcright.c b/lib/dpkg-def.h
similarity index 66%
copy from lib/showcright.c
copy to lib/dpkg-def.h
index 3f130c6..08e01cb 100644
--- a/lib/showcright.c
+++ b/lib/dpkg-def.h
@@ -1,6 +1,6 @@
/*
* libdpkg - Debian packaging suite library routines
- * showcright.c - show copyright file routine
+ * dpkg-def.h - C language support definitions
*
* Copyright (C) 1994,1995 Ian Jackson <[EMAIL PROTECTED]>
*
@@ -18,20 +18,22 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <config.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
+#ifndef DPKG_DEF_H
+#define DPKG_DEF_H
+
+#include <config.h>
-#include <dpkg.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
-void showcopyright(const struct cmdinfo *c, const char *v) NONRETURNING;
-void showcopyright(const struct cmdinfo *c, const char *v) {
- int fd;
- fd= open(COPYINGFILE,O_RDONLY);
- if (fd < 0)
- ohshite(_("cannot open GPL file"));
- fd_fd_copy(fd, 1, -1, "showcopyright");
- exit(0);
-}
+#endif
diff --git a/lib/dpkg.h b/lib/dpkg.h
index edb4009..60c0500 100644
--- 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 6108163..af534dd 100644
--- 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;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
