Просмотр исходного кода

Unify inclusion usage of config.h

Do not include it from header files. And use <> instead of "".
Guillem Jover лет назад: 18
Родитель
Сommit
88e7b54eeb
8 измененных файлов с 19 добавлено и 6 удалено
  1. 10 0
      ChangeLog
  2. 2 0
      dselect/helpmsgs.cc
  3. 0 1
      dselect/helpmsgs.h
  4. 2 0
      lib/cleanup.c
  5. 0 2
      lib/dpkg-def.h
  6. 2 1
      lib/md5.c
  7. 2 1
      lib/mlib.c
  8. 1 1
      utils/start-stop-daemon.c

+ 10 - 0
ChangeLog

@@ -1,3 +1,13 @@
+2008-08-24  Guillem Jover  <guillem@debian.org>
+
+	* 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  <hertzog@debian.org>
 
 	* man/dpkg-source.1: Clarify two points concerning the behaviour

+ 2 - 0
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 = {

+ 0 - 1
dselect/helpmsgs.h

@@ -23,7 +23,6 @@
 #define HELPMSGS_H
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 }
 

+ 2 - 0
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>

+ 0 - 2
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)))

+ 2 - 1
lib/md5.c

@@ -19,7 +19,8 @@
  *  - Ian Jackson <ian@chiark.greenend.org.uk>.
  * Still in the public domain.
  */
-#include "config.h"
+
+#include <config.h>
 
 #include <string.h>		/* for memcpy() */
 #include <sys/types.h>		/* for stupid systems */

+ 2 - 1
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>

+ 1 - 1
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>