From ea54214002c09eeb4dd498d97a564471ec9993c5 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 13 Sep 2011 10:09:00 +0200
Subject: reorder includes: add <config.h> if needed and include it at first

---
 methods/bzip2.cc      | 2 ++
 methods/cdrom.cc      | 2 ++
 methods/connect.cc    | 4 +++-
 methods/copy.cc       | 2 ++
 methods/file.cc       | 2 ++
 methods/ftp.cc        | 4 +++-
 methods/gpgv.cc       | 6 ++++--
 methods/gzip.cc       | 2 ++
 methods/http.cc       | 6 ++++--
 methods/http_main.cc  | 2 ++
 methods/https.cc      | 5 +++--
 methods/mirror.cc     | 4 +++-
 methods/rfc2553emu.cc | 4 +++-
 methods/rred.cc       | 2 ++
 methods/rsh.cc        | 5 ++++-
 15 files changed, 41 insertions(+), 11 deletions(-)

(limited to 'methods')

diff --git a/methods/bzip2.cc b/methods/bzip2.cc
index 42932dded..eff83bda7 100644
--- a/methods/bzip2.cc
+++ b/methods/bzip2.cc
@@ -13,6 +13,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index b25fdf5a8..82d806e9d 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -8,6 +8,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/cdromutl.h>
diff --git a/methods/connect.cc b/methods/connect.cc
index a5af1f1a6..16fb6e793 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -11,7 +11,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include "connect.h"
+#include <config.h>
+
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 
@@ -29,6 +30,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
+#include "connect.h"
 #include "rfc2553emu.h"
 #include <apti18n.h>
 									/*}}}*/
diff --git a/methods/copy.cc b/methods/copy.cc
index a6bb372a3..94467e054 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -9,6 +9,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
diff --git a/methods/file.cc b/methods/file.cc
index 9cdd5bc2d..9fc4cd76c 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -13,6 +13,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
diff --git a/methods/ftp.cc b/methods/ftp.cc
index 97248f900..a445d767c 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -15,6 +15,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
@@ -30,7 +32,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <iostream>
-#include <apti18n.h>
 
 // Internet stuff
 #include <netinet/in.h>
@@ -41,6 +42,7 @@
 #include "rfc2553emu.h"
 #include "connect.h"
 #include "ftp.h"
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 960c06180..9de29ddf3 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,9 +1,10 @@
+#include <config.h>
+
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/indexcopy.h>
-#include <apti18n.h>
 
 #include <utime.h>
 #include <stdio.h>
@@ -12,9 +13,10 @@
 #include <sys/wait.h>
 #include <iostream>
 #include <sstream>
-
 #include <vector>
 
+#include <apti18n.h>
+
 #define GNUPGPREFIX "[GNUPG:]"
 #define GNUPGBADSIG "[GNUPG:] BADSIG"
 #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY"
diff --git a/methods/gzip.cc b/methods/gzip.cc
index fc4e1ecfd..6202d73dc 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -9,6 +9,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
diff --git a/methods/http.cc b/methods/http.cc
index 13f9cbe06..e505b816e 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -25,6 +25,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
@@ -41,8 +43,6 @@
 #include <string.h>
 #include <iostream>
 #include <map>
-#include <apti18n.h>
-
 
 // Internet stuff
 #include <netdb.h>
@@ -51,6 +51,8 @@
 #include "connect.h"
 #include "rfc2553emu.h"
 #include "http.h"
+
+#include <apti18n.h>
 									/*}}}*/
 using namespace std;
 
diff --git a/methods/http_main.cc b/methods/http_main.cc
index 7815c2fc1..2ca91bfc9 100644
--- a/methods/http_main.cc
+++ b/methods/http_main.cc
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <signal.h>
diff --git a/methods/https.cc b/methods/https.cc
index fc649d6c2..45bd2a367 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -10,6 +10,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
@@ -25,12 +27,11 @@
 #include <errno.h>
 #include <string.h>
 #include <iostream>
-#include <apti18n.h>
 #include <sstream>
 
 #include "config.h"
 #include "https.h"
-
+#include <apti18n.h>
 									/*}}}*/
 using namespace std;
 
diff --git a/methods/mirror.cc b/methods/mirror.cc
index 713dc211a..768e6b3a3 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -8,6 +8,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/acquire-item.h>
@@ -33,7 +35,7 @@ using namespace std;
 
 #include "mirror.h"
 #include "http.h"
-#include "apti18n.h"
+#include <apti18n.h>
 									/*}}}*/
 
 /* Done:
diff --git a/methods/rfc2553emu.cc b/methods/rfc2553emu.cc
index 66bc906e9..f00e85889 100644
--- a/methods/rfc2553emu.cc
+++ b/methods/rfc2553emu.cc
@@ -14,12 +14,14 @@
 
    ##################################################################### */
 									/*}}}*/
-#include "rfc2553emu.h"
+#include <config.h>
+
 #include <stdlib.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <stdio.h>
+#include "rfc2553emu.h"
 
 #ifndef HAVE_GETADDRINFO
 // getaddrinfo - Resolve a hostname					/*{{{*/
diff --git a/methods/rred.cc b/methods/rred.cc
index 849973e1a..80fc98ac5 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -1,4 +1,6 @@
 // Includes									/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>
diff --git a/methods/rsh.cc b/methods/rsh.cc
index 21f0d0a22..10fe76dc3 100644
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -11,7 +11,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include "rsh.h"
+#include <config.h>
+
 #include <apt-pkg/error.h>
 
 #include <sys/stat.h>
@@ -22,6 +23,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdarg.h>
+#include "rsh.h"
+
 #include <apti18n.h>
 									/*}}}*/
 
-- 
cgit v1.2.3