The following commit has been merged in the master branch:
commit 88e7b54eeb46dcfa78e34aad91710df38d22451d
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sun Aug 24 02:03:27 2008 +0300
Unify inclusion usage of config.h
Do not include it from header files. And use <> instead of "".
diff --git a/ChangeLog b/ChangeLog
index 879d7fa..fbcd001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-24 Guillem Jover <[EMAIL PROTECTED]>
+
+ * lib/dpkg-def.h: Do not include <config.h>.
+ * dselect/helpmsgs.h: Likewise.
+ * dselect/helpmsgs.cc: Include <config.h>.
+ * lib/cleanup.c: Likewise.
+ * lib/md5.c: Include <config.h> instead of "config.h".
+ * lib/mlib.c: Likewise.
+ * utils/start-stop-daemon.c: Likewise.
+
2008-08-22 Raphael Hertzog <[EMAIL PROTECTED]>
* man/dpkg-source.1: Clarify two points concerning the behaviour
diff --git a/dselect/helpmsgs.cc b/dselect/helpmsgs.cc
index cf6259c..3cacba2 100644
--- a/dselect/helpmsgs.cc
+++ b/dselect/helpmsgs.cc
@@ -19,6 +19,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <config.h>
+
#include "helpmsgs.h"
const struct helpmessage hlp_listkeys = {
diff --git a/dselect/helpmsgs.h b/dselect/helpmsgs.h
index 6910590..5b6e909 100644
--- a/dselect/helpmsgs.h
+++ b/dselect/helpmsgs.h
@@ -23,7 +23,6 @@
#define HELPMSGS_H
extern "C" {
-#include <config.h>
#include <dpkg.h>
}
diff --git a/lib/cleanup.c b/lib/cleanup.c
index 96d8e8a..2820cee 100644
--- a/lib/cleanup.c
+++ b/lib/cleanup.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <config.h>
+
#include <dpkg.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/lib/dpkg-def.h b/lib/dpkg-def.h
index 97a0651..ec1558a 100644
--- a/lib/dpkg-def.h
+++ b/lib/dpkg-def.h
@@ -22,8 +22,6 @@
#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)))
diff --git a/lib/md5.c b/lib/md5.c
index 8a7d354..5e5a5f2 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -19,7 +19,8 @@
* - Ian Jackson <[EMAIL PROTECTED]>.
* Still in the public domain.
*/
-#include "config.h"
+
+#include <config.h>
#include <string.h> /* for memcpy() */
#include <sys/types.h> /* for stupid systems */
diff --git a/lib/mlib.c b/lib/mlib.c
index 525b014..1dd8187 100644
--- a/lib/mlib.c
+++ b/lib/mlib.c
@@ -18,7 +18,8 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "config.h"
+
+#include <config.h>
#include <unistd.h>
#include <stdio.h>
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 7890b08..10c15f4 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -20,7 +20,7 @@
* Changes by Ian Jackson: added --retry (and associated rearrangements).
*/
-#include "config.h"
+#include <config.h>
#include <dpkg-def.h>
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
