Almost *EVERY* damn file was including config.h in the wrong spot. After

making it the first include, then off_t/size_t/etc could actually be
redefined to be 64-bit compatible.

diff --git a/ChangeLog b/ChangeLog
index 49c005d185c9092d64fb68da1909f0ca8749c6e9..e5ff5a136a5cfbca54e07f3cbf1f97514af9ad79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
+Sat Oct 25 15:02:27 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * almost all .c files: Almost *EVERY* damn file was including config.h in
+    the wrong spot.  After making it the first include, then
+    off_t/size_t/etc could actually be redefined to be 64-bit compatible.
+
 Sat Oct 25 12:47:22 CDT 2003 Adam Heath <doogie@debian.org>
+
   * scripts/dpkg-checkbuilddeps.pl: Fix dpkg-checkbuilddeps calling of
     parsedep.  It wasn't setting use_arch.
 

diff --git a/debian/changelog b/debian/changelog
index 4b53d6c2c4e1b0d29d51dce10b5d38f133293de1..aab6a4b0a2f1400a86f5fd6c20aa0759cbdcef58 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 dpkg (1.10.16) unstable; urgency=low
 
+  * Almost *EVERY* damn file was including config.h in the wrong spot.
+    After making it the first include, then off_t/size_t/etc could actually
+    be redefined to be 64-bit compatible.
   * Jordi Mallach <jordi@debian.org>:
     Fix configure to set HAVE_SETLOCALE.  Closes: #211816
   * "Loïc Le Loarer" <lll_deb@m4x.org>:

diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index a79ab091fab989e0870569d0891f96c0b7747a2d..81467d9a86a88981ad5821284e9560783c237409 100644 (file)
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -38,7 +40,6 @@
 #include <zlib.h>
 #endif
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "dpkg-deb.h"

diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index 82534a0c21eb736957dbf84b5bac085ba485660c..caa6fc97fe90a6ca83a2dd1db7f65374d3e013ef 100644 (file)
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -37,7 +38,6 @@
 #include <zlib.h>
 #endif
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-deb.h>
 #include <myopt.h>

diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c
index cd8215d66cc9d063004892c8f27a537179c1fa4a..5095f621d3918c0b5dde9991aa48328822ead5a2 100644 (file)
--- a/dpkg-deb/info.c
+++ b/dpkg-deb/info.c
@@ -19,6 +19,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -33,7 +34,6 @@
 #include <limits.h>
 #include <ctype.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>

diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 9d98e1d64e6cc57b13e31feaf94f43e00ab385ac..9bf1f66323d9f1e6b48e5f40c645a51a8f5e40db 100644 (file)
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -33,7 +34,6 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <version.h>
 #include <myopt.h>

diff --git a/dselect/basecmds.cc b/dselect/basecmds.cc
index e294f84aecc3f260ad013a08f5c48706a4043d4f..4c5c4bbe90d26acc4136a7a04e26795ee230906a 100644 (file)
--- a/dselect/basecmds.cc
+++ b/dselect/basecmds.cc
@@ -19,13 +19,14 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
+extern "C" {
+#include <config.h>
+}
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index b21bdcaba15b2d1ae19b3b5ddee8056987ce05ce..c942318e9168ec0c003de4b67c2a6614ecf460c7 100644 (file)
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -19,6 +19,9 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -29,7 +32,6 @@
 #include <sys/termios.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/basetop.cc b/dselect/basetop.cc
index 4bfbfed68fd625c22dd3f977fcc7927c3fe49a88..82c1be6be3c3d2c52ff11f36e7f0450aef8548fa 100644 (file)
--- a/dselect/basetop.cc
+++ b/dselect/basetop.cc
@@ -18,14 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
+extern "C" {
+#include <config.h>
+}
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/bindings.cc b/dselect/bindings.cc
index f83a22d72e23d4427eeba5d22200b0d5cfc42cb5..444c6609456533ad88d7dd3acb7b8518e7d10ccc 100644 (file)
--- a/dselect/bindings.cc
+++ b/dselect/bindings.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/main.cc b/dselect/main.cc
index 4dfc329ae95e2d16c16ba6b613ef82b40fbf646e..dcd93d45b0cd42d1689e1c3746a37b4f577e7bb5 100644 (file)
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -19,6 +19,9 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -36,7 +39,6 @@
 #include <term.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <version.h>

diff --git a/dselect/methkeys.cc b/dselect/methkeys.cc
index db18202e0d6c6f21a78559f2f715da5cb6397125..4ec7cb2cff8f2b2ef9839cfc204da19e8562a7bb 100644 (file)
--- a/dselect/methkeys.cc
+++ b/dselect/methkeys.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/methlist.cc b/dselect/methlist.cc
index 25c8597375fd73f62ec08e825a64d65ff7c73e48..7761c49af62a11b935a289100e8b27370eb6998d 100644 (file)
--- a/dselect/methlist.cc
+++ b/dselect/methlist.cc
@@ -19,6 +19,9 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -26,7 +29,6 @@
 #include <errno.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/method.cc b/dselect/method.cc
index 9a02ad42736a9d958d78ab727fda535daa60a0f7..0efcce3e7acab0eb431261e3af211a6a0aa18112 100644 (file)
--- a/dselect/method.cc
+++ b/dselect/method.cc
@@ -19,6 +19,9 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -38,7 +41,6 @@
 #include <sys/file.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/methparse.cc b/dselect/methparse.cc
index 86d1a505a3f2b773f04b2116a7166baba06509c6..1f49c2c27e6c180efb5c298b65998f39d25be5fc 100644 (file)
--- a/dselect/methparse.cc
+++ b/dselect/methparse.cc
@@ -18,6 +18,9 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -34,7 +37,6 @@
 
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/pkgcmds.cc b/dselect/pkgcmds.cc
index d153b5291f58114808057370f8d6de50e8a37342..14a95c79c519e1fec1a010c08f7d635605961041 100644 (file)
--- a/dselect/pkgcmds.cc
+++ b/dselect/pkgcmds.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index 0c0afca5324a0575e616aaf7bfc16ef8b612430e..91208556573c7f718a2bdb56e69ea71004a315ec 100644 (file)
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index 09969da8f8896c19fa997c1ae0521d60706072d1..2fc178092c8ee2e5eb95dd225af6ed78ba4ed7d5 100644 (file)
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/pkginfo.cc b/dselect/pkginfo.cc
index 4061539d98d5aca7237301687e34a9153b4352f2..6c8aeb0256b6558ce157b726c322a87fe6557a29 100644 (file)
--- a/dselect/pkginfo.cc
+++ b/dselect/pkginfo.cc
@@ -18,6 +18,9 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -25,7 +28,6 @@
 #include <ctype.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/pkgkeys.cc b/dselect/pkgkeys.cc
index cff8932d0bc4ba0e4da71f66cd3d1535adf13d56..98029e7441957933b935327ba9b807feb462884a 100644 (file)
--- a/dselect/pkgkeys.cc
+++ b/dselect/pkgkeys.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index bd5f32712e1a3f1b00d6f15a30f775f56924c5ae..f4eefdc14a52bce31469b8a9f9d5c3ac040fe653 100644 (file)
--- a/dselect/pkglist.cc
+++ b/dselect/pkglist.cc
@@ -19,6 +19,9 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -26,7 +29,6 @@
 #include <errno.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc
index 72bde0898ff6851739cb71c69484c8332dc0deb5..fe41ebc2b12cbc063640e5dbd3eed55499000575 100644 (file)
--- a/dselect/pkgsublist.cc
+++ b/dselect/pkgsublist.cc
@@ -18,13 +18,15 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc
index 7d9ee976a2d8ccad201001fa805530709dcd8e33..385ed53f2dbf535ce23475a0582ff6b452c3e101 100644 (file)
--- a/dselect/pkgtop.cc
+++ b/dselect/pkgtop.cc
@@ -18,6 +18,9 @@
  * License along with this; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+extern "C" {
+#include <config.h>
+}
 
 #include <stdio.h>
 #include <string.h>
@@ -25,7 +28,6 @@
 #include <ctype.h>
 
 extern "C" {
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 }

diff --git a/lib/compat.c b/lib/compat.c
index 438602af0e3dad4a48495439eb286b6de8cbf643..09d4a9c6dc559dd5b53c441b1046769b05b650ac 100644 (file)
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <signal.h>
@@ -30,7 +31,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <config.h>
 #include <dpkg.h>
 
 #ifndef HAVE_VSNPRINTF

diff --git a/lib/database.c b/lib/database.c
index 9e463882856bf246827597d9b83ae1b8ee7fb008..299f294b6ca8f13cb05496ef8a1158b4efc1a0d0 100644 (file)
--- a/lib/database.c
+++ b/lib/database.c
@@ -18,11 +18,11 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <ctype.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 

diff --git a/lib/dbmodify.c b/lib/dbmodify.c
index d31317b62ad0e84e7015c8b32fe113a35f64eb14..48896137f6073b3522d21833ca3d29b41508e2d1 100644 (file)
--- a/lib/dbmodify.c
+++ b/lib/dbmodify.c
@@ -19,6 +19,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -34,7 +35,6 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 

diff --git a/lib/dump.c b/lib/dump.c
index 13483c192eb22875fb149152abb278d3949bb058..48976d7f127dd147518bd22746799fe0d78b09ff 100644 (file)
--- a/lib/dump.c
+++ b/lib/dump.c
@@ -21,6 +21,7 @@
  */
 
 /* fixme: don't write uninteresting packages */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -31,7 +32,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "parsedump.h"

diff --git a/lib/ehandle.c b/lib/ehandle.c
index db4c5ed2903afdef4674df826e6613327af1fb23..d60804b50f8f4fdfb3e143f3a0b1c663bf3cf787 100644 (file)
--- a/lib/ehandle.c
+++ b/lib/ehandle.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -27,7 +28,6 @@
 #include <stdarg.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 

diff --git a/lib/fields.c b/lib/fields.c
index f192cedbce56d3796c2b403a268298610e5184c9..2f39f641b43a98ff2c4d422c29c30a32fb65bcae 100644 (file)
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -19,12 +19,12 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "parsedump.h"

diff --git a/lib/lock.c b/lib/lock.c
index 1787b1dd026fea5acdfeff0b6fbb8ff8058c5bb5..06fb413eac271d28c324afe99da9638f5e5a4cf0 100644 (file)
--- a/lib/lock.c
+++ b/lib/lock.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -28,7 +29,6 @@
 #include <fcntl.h>
 #include <sys/file.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 

diff --git a/lib/md5.c b/lib/md5.c
index 3adddd10571673f286f958092fa03c631612abb1..8a7d354faf70e176f19fddc66ac0d0e47482157c 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -19,12 +19,12 @@
  *  - Ian Jackson <ian@chiark.greenend.org.uk>.
  * Still in the public domain.
  */
+#include "config.h"
 
 #include <string.h>            /* for memcpy() */
 #include <sys/types.h>         /* for stupid systems */
 #include <netinet/in.h>                /* for ntohl() */
 
-#include "config.h"
 #include "md5.h"
 
 #ifdef WORDS_BIGENDIAN

diff --git a/lib/mlib.c b/lib/mlib.c
index 6fc3cff6d9533a476e2f91530032b888a161b23a..8ae5a29b6f52245107adbee802a6d431705637db 100644 (file)
--- a/lib/mlib.c
+++ b/lib/mlib.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <unistd.h>
 #include <stdio.h>
@@ -30,7 +31,6 @@
 #include <sys/wait.h>
 #include <sys/types.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <md5.h>

diff --git a/lib/myopt.c b/lib/myopt.c
index 194883369c92eed3461b56d761fe7b7899f30f60..adfef9b7fef565c2e6e522a12528039dd65528bc 100644 (file)
--- a/lib/myopt.c
+++ b/lib/myopt.c
@@ -19,13 +19,13 @@
  * License along with this file; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
 #include <stdlib.h>
 
-#include <config.h>
 #include <myopt.h>
 #include <dpkg.h>
 

diff --git a/lib/nfmalloc.c b/lib/nfmalloc.c
index f44d08c8a918c0c624162879f223c464d8b56a96..9b3cfcf56674fcd3aaffbdd44e9ac831ac41bc05 100644 (file)
--- a/lib/nfmalloc.c
+++ b/lib/nfmalloc.c
@@ -18,11 +18,11 @@
  * 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 <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 

diff --git a/lib/parse.c b/lib/parse.c
index d0543403f70918e93f5805427572f873773a85b8..81c14714b8e6809f80463e867d337d400e93b61f 100644 (file)
--- a/lib/parse.c
+++ b/lib/parse.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -30,7 +31,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "parsedump.h"

diff --git a/lib/parsehelp.c b/lib/parsehelp.c
index 0f13d7ac31d6bcd3e57fcb28a91337440adf7acc..9478445b8db5397774a4fb16280e8234ed380cd8 100644 (file)
--- a/lib/parsehelp.c
+++ b/lib/parsehelp.c
@@ -18,12 +18,12 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "parsedump.h"

diff --git a/lib/showcright.c b/lib/showcright.c
index bebe3c40ef7ee8d29469f1e710aea916ddbab1c2..8849c752eeb8e99b056b963d4b21bd996d7168db 100644 (file)
--- a/lib/showcright.c
+++ b/lib/showcright.c
@@ -18,12 +18,12 @@
  * 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>
 
-#include <config.h>
 #include <dpkg.h>
 
 void showcopyright(const struct cmdinfo *c, const char *v) NONRETURNING;

diff --git a/lib/showpkg.c b/lib/showpkg.c
index 329160bb8126f2a5746b34655e8892d236591d43..68228b12d8b3f7d6c14271c02c9b2760278729c0 100644 (file)
--- a/lib/showpkg.c
+++ b/lib/showpkg.c
@@ -17,11 +17,12 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 

diff --git a/lib/varbuf.c b/lib/varbuf.c
index 1831d92e9b39c27e5135da96ad93f3b290dcd8b2..3ef97f5442e8173ee13cee97031d17a16a2af088 100644 (file)
--- a/lib/varbuf.c
+++ b/lib/varbuf.c
@@ -18,12 +18,12 @@
  * 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 <string.h>
 #include <stdio.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 

diff --git a/lib/vercmp.c b/lib/vercmp.c
index 2e73043d8aa89b6ca8136d70b76db0e962706620..5e9b006ca220b40eac3aa5d762561b1f484192cb 100644 (file)
--- a/lib/vercmp.c
+++ b/lib/vercmp.c
@@ -18,11 +18,11 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <ctype.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "parsedump.h"

diff --git a/main/archives.c b/main/archives.c
index c89f9de9952e25b732c6cb5f361e74746b803be8..7d61497e626745b1cda3121f3741a01bbe102cc0 100644 (file)
--- a/main/archives.c
+++ b/main/archives.c
@@ -19,6 +19,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -37,7 +38,6 @@
 #define obstack_chunk_alloc m_malloc
 #define obstack_chunk_free free
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <tarfn.h>

diff --git a/main/cleanup.c b/main/cleanup.c
index 32db3c69b1a33abde6cb479e5739122e4dc812ea..3d93e8e429ab83f20c1188c08cc02dbfae8020de 100644 (file)
--- a/main/cleanup.c
+++ b/main/cleanup.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -32,7 +33,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <tarfn.h>

diff --git a/main/configure.c b/main/configure.c
index b82a69314db9ce90d818f26f79be9498632ddef4..741da37b9ea8c49723b9e1d2fc9708f61fcf8a18 100644 (file)
--- a/main/configure.c
+++ b/main/configure.c
@@ -19,6 +19,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <signal.h>
@@ -36,7 +37,6 @@
 #include <assert.h>
 #include <sys/wait.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 

diff --git a/main/depcon.c b/main/depcon.c
index 3f6176d0465cd905c916e621519ca603ce0f4ec7..576770054f22e6890098c6b9a6722452f7696d5b 100644 (file)
--- a/main/depcon.c
+++ b/main/depcon.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <unistd.h>
@@ -25,7 +26,6 @@
 #include <sys/types.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 

diff --git a/main/enquiry.c b/main/enquiry.c
index c10604955ac20592373e43ec1256e12c5ea05e74..a8a8b762136c6696b52922395120dfb2aba3b081 100644 (file)
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -20,6 +20,7 @@
  */
 
 /* fixme: per-package audit */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -33,7 +34,6 @@
 #include <sys/termios.h>
 #include <fcntl.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>

diff --git a/main/errors.c b/main/errors.c
index 30d3130eacc7436af1ee33787beb54e28436aa82..a5411b6e506e3beed519a2fbe1ce32f5496abf2d 100644 (file)
--- a/main/errors.c
+++ b/main/errors.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -32,7 +33,6 @@
 #include <limits.h>
 #include <ctype.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>

diff --git a/main/filesdb.c b/main/filesdb.c
index b5b086eafe0d6cb5307b42c1a096e74a6e078c83..35f1d2ed59a1e1172cdf5eb0cd1125b83f43d001 100644 (file)
--- a/main/filesdb.c
+++ b/main/filesdb.c
@@ -19,6 +19,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <assert.h>
 #include <unistd.h>
@@ -31,7 +32,6 @@
 #include <grp.h>
 #include <sys/types.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 

diff --git a/main/help.c b/main/help.c
index 9cde30ceed9487a23fae68f78b3ead963363e33e..b000cdc6c9ad5134b02486cf4a2fef12e4d9cb74 100644 (file)
--- a/main/help.c
+++ b/main/help.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <unistd.h>
@@ -29,7 +30,6 @@
 #include <sys/wait.h>
 #include <signal.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <version.h>
 #include <dpkg-db.h>

diff --git a/main/main.c b/main/main.c
index 3e5607cd132574ee6d43b2c5dc4fef83eaf33f85..1235b523aa97e54afa9f50882f517ca7ef86427d 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -32,7 +33,6 @@
 #include <limits.h>
 #include <ctype.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <version.h>

diff --git a/main/packages.c b/main/packages.c
index b7644955fa89ed8714ff6720f99e119d6a379a58..594ea227ba85c5406a5c6d40db2fb473dd12c3fe 100644 (file)
--- a/main/packages.c
+++ b/main/packages.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -32,7 +33,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>

diff --git a/main/processarc.c b/main/processarc.c
index 20c4473a8ce837c81ffa9dfcc58de32cca84c025..2eedfb5e6db9c30232af5fbd134bd98de7aed175 100644 (file)
--- a/main/processarc.c
+++ b/main/processarc.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -34,7 +35,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <tarfn.h>

diff --git a/main/query.c b/main/query.c
index c3f69a1e19f6019ee18a5ceed524e4fca6685aa8..51e0cffaef9af503f1f0842a76b7c094341901ee 100644 (file)
--- a/main/query.c
+++ b/main/query.c
@@ -22,6 +22,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -35,7 +36,6 @@
 #include <sys/termios.h>
 #include <fcntl.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>

diff --git a/main/remove.c b/main/remove.c
index 7b111b16569d1ead225e3cec3eaf8863515e9949..f764ead6dfdb1b6d9f1a22c10c3ceba17bcef78e 100644 (file)
--- a/main/remove.c
+++ b/main/remove.c
@@ -32,6 +32,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -47,7 +48,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>

diff --git a/main/select.c b/main/select.c
index 9ed969851fc7ed334a3d1cd803b17d877f7ff76f..a8becab2866751cf22eaef4bfc8824b27257d099 100644 (file)
--- a/main/select.c
+++ b/main/select.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -25,7 +26,6 @@
 #include <fnmatch.h>
 #include <ctype.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 

diff --git a/main/update.c b/main/update.c
index 82224b33f99a2b3d114f6311d88a84e82ddddbe3..14ba4eaf671d9023f17d86b5b1504a722a966613 100644 (file)
--- a/main/update.c
+++ b/main/update.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -27,7 +28,6 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <myopt.h>

diff --git a/split/info.c b/split/info.c
index 1698e05a9f235bff2d3b7d03e00460b0e450705c..8cb0a933f207568afac8ab2e847613aad8cea23a 100644 (file)
--- a/split/info.c
+++ b/split/info.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,7 +30,6 @@
 #include <ar.h>
 #include <ctype.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "dpkg-split.h"

diff --git a/split/join.c b/split/join.c
index 18745dc8e4552f2fe53a5d67da2181da09d23916..4add3904add0cfa9f95cfcc568d50a0a6eb31ad2 100644 (file)
--- a/split/join.c
+++ b/split/join.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,7 +26,6 @@
 #include <assert.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "dpkg-split.h"

diff --git a/split/main.c b/split/main.c
index 4ab3c956ad75dcd9a0356dea80534127bdea0481..133f7a93e91b6330ecb3fb3b9997b36a4e8788b5 100644 (file)
--- a/split/main.c
+++ b/split/main.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <string.h>
 #include <stdio.h>
@@ -25,7 +26,6 @@
 #include <limits.h>
 #include <assert.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include <version.h>

diff --git a/split/queue.c b/split/queue.c
index 0448e8c11e17668bca91e929b3a1adc03c1072e1..6a1312fa10625e2f23b77d7a29d313bba4f7ce98 100644 (file)
--- a/split/queue.c
+++ b/split/queue.c
@@ -27,6 +27,7 @@
  *  <md5sum>.<maxpartlen>.<thispartn>.<maxpartn>
  * all numbers in hex
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -38,7 +39,6 @@
 #include <dirent.h>
 #include <string.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "dpkg-split.h"

diff --git a/split/split.c b/split/split.c
index aad2904b6a3a7c36e1d2ee46548b9f0a741b6ec3..2c3b7894df05986571c9edc73117daab2374100f 100644 (file)
--- a/split/split.c
+++ b/split/split.c
@@ -18,6 +18,7 @@
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,7 +29,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <config.h>
 #include <dpkg.h>
 #include <dpkg-db.h>
 #include "dpkg-split.h"