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.

17 files changed, 51 insertions, 19 deletions

diff --git a/dselect/basecmds.cc b/dselect/basecmds.cc
index e294f84ae..4c5c4bbe9 100644
--- 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 b21bdcaba..c942318e9 100644
--- 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 4bfbfed68..82c1be6be 100644
--- 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 f83a22d72..444c66094 100644
--- 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 4dfc329ae..dcd93d45b 100644
--- 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 db18202e0..4ec7cb2cf 100644
--- 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 25c859737..7761c49af 100644
--- 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 9a02ad427..0efcce3e7 100644
--- 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 86d1a505a..1f49c2c27 100644
--- 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 d153b5291..14a95c79c 100644
--- 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 0c0afca53..912085565 100644
--- 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 09969da8f..2fc178092 100644
--- 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 4061539d9..6c8aeb025 100644
--- 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 cff8932d0..98029e744 100644
--- 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 bd5f32712..f4eefdc14 100644
--- 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 72bde0898..fe41ebc2b 100644
--- 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 7d9ee976a..385ed53f2 100644
--- 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>
 }