From d77559acad5da864e764aef8aed08046e4d38ed4 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 17:04:52 +0000
Subject: * Patch from Eric Wong <normalperson@yhbt.net> to inclu... Author:
 mdz Date: 2004-01-07 20:39:37 GMT * Patch from Eric Wong
 <normalperson@yhbt.net> to include apt18n.h after other headers to avoid
 breaking locale.h when setlocale() is defined as an empty macro (Closes:
 #226509)

---
 methods/cdrom.cc   | 4 ++--
 methods/connect.cc | 4 ++--
 methods/copy.cc    | 4 ++--
 methods/file.cc    | 4 ++--
 methods/ftp.cc     | 4 ++--
 methods/gzip.cc    | 4 ++--
 methods/http.cc    | 4 ++--
 methods/rsh.cc     | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'methods')

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index f6b0bc679..17872de29 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: cdrom.cc,v 1.20 2003/02/10 07:34:41 doogie Exp $
+// $Id: cdrom.cc,v 1.21 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    CDROM URI method for APT
@@ -8,7 +8,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
@@ -19,6 +18,7 @@
 #include <unistd.h>
 
 #include <iostream>
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
diff --git a/methods/connect.cc b/methods/connect.cc
index 23961d83b..d1d71b004 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: connect.cc,v 1.10 2003/02/10 07:34:41 doogie Exp $
+// $Id: connect.cc,v 1.11 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    Connect - Replacement connect call
@@ -11,7 +11,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include "connect.h"
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
@@ -27,6 +26,7 @@
 #include <netdb.h>
 
 #include "rfc2553emu.h"
+#include <apti18n.h>
 									/*}}}*/
 
 static string LastHost;
diff --git a/methods/copy.cc b/methods/copy.cc
index 87e77eda3..4cbfa3532 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: copy.cc,v 1.7 2003/02/10 07:34:41 doogie Exp $
+// $Id: copy.cc,v 1.8 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    Copy URI - This method takes a uri like a file: uri and copies it
@@ -9,7 +9,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
@@ -17,6 +16,7 @@
 #include <sys/stat.h>
 #include <utime.h>
 #include <unistd.h>
+#include <apti18n.h>
 									/*}}}*/
 
 class CopyMethod : public pkgAcqMethod
diff --git a/methods/file.cc b/methods/file.cc
index bf7d380c5..9fc5764d6 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: file.cc,v 1.9 2003/02/10 07:34:41 doogie Exp $
+// $Id: file.cc,v 1.10 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    File URI method for APT
@@ -13,12 +13,12 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 
 #include <sys/stat.h>
 #include <unistd.h>
+#include <apti18n.h>
 									/*}}}*/
 
 class FileMethod : public pkgAcqMethod
diff --git a/methods/ftp.cc b/methods/ftp.cc
index fb84f3f55..cf2838e3f 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: ftp.cc,v 1.31 2003/08/10 02:24:39 mdz Exp $
+// $Id: ftp.cc,v 1.32 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    FTP Aquire Method - This is the FTP aquire method for APT.
@@ -15,7 +15,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
@@ -30,6 +29,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <iostream>
+#include <apti18n.h>
 
 // Internet stuff
 #include <netinet/in.h>
diff --git a/methods/gzip.cc b/methods/gzip.cc
index 35501cb0a..af1ac465e 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: gzip.cc,v 1.17 2003/02/10 07:34:41 doogie Exp $
+// $Id: gzip.cc,v 1.18 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    GZip method - Take a file URI in and decompress it into the target 
@@ -9,7 +9,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
@@ -21,6 +20,7 @@
 #include <utime.h>
 #include <stdio.h>
 #include <errno.h>
+#include <apti18n.h>
 									/*}}}*/
 
 const char *Prog;
diff --git a/methods/http.cc b/methods/http.cc
index 5cfad08c6..a5af28917 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: http.cc,v 1.56 2003/02/12 15:33:36 doogie Exp $
+// $Id: http.cc,v 1.57 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -25,7 +25,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
@@ -40,6 +39,7 @@
 #include <errno.h>
 #include <string.h>
 #include <iostream>
+#include <apti18n.h>
 
 // Internet stuff
 #include <netdb.h>
diff --git a/methods/rsh.cc b/methods/rsh.cc
index 6cd618201..2292e72e4 100644
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: rsh.cc,v 1.6 2003/02/10 07:34:41 doogie Exp $
+// $Id: rsh.cc,v 1.7 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    RSH method - Transfer files via rsh compatible program
@@ -11,7 +11,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include "rsh.h"
 #include <apt-pkg/error.h>
 
@@ -23,6 +22,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <apti18n.h>
 									/*}}}*/
 
 const char *Prog;
-- 
cgit v1.2.3