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)

---
 apt-inst/contrib/arfile.cc     | 4 ++--
 apt-inst/contrib/extracttar.cc | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'apt-inst/contrib')

diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index b423eb4cb..eb708271e 100644
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: arfile.cc,v 1.6 2003/07/18 14:15:11 mdz Exp $
+// $Id: arfile.cc,v 1.7 2004/01/07 20:39:37 mdz Exp $
 /* ######################################################################
 
    AR File - Handle an 'AR' archive
@@ -17,13 +17,13 @@
 #ifdef __GNUG__
 #pragma implementation "apt-pkg/arfile.h"
 #endif
-#include <apti18n.h>
 #include <apt-pkg/arfile.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 
 #include <stdlib.h>
 									/*}}}*/
+#include <apti18n.h>
 
 struct ARArchive::MemberHeader
 {
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 5d939bd80..63bb2ba80 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: extracttar.cc,v 1.8 2003/07/18 15:35:23 mdz Exp $
+// $Id: extracttar.cc,v 1.9 2004/01/07 20:39:37 mdz Exp $
 /* ######################################################################
 
    Extract a Tar - Tar Extractor
@@ -19,7 +19,6 @@
 #ifdef __GNUG__
 #pragma implementation "apt-pkg/extracttar.h"
 #endif
-#include <apti18n.h>
 #include <apt-pkg/extracttar.h>
 
 #include <apt-pkg/error.h>
@@ -32,7 +31,9 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <iostream>
+#include <apti18n.h>
 									/*}}}*/
+
 using namespace std;
     
 // The on disk header for a tar file.
-- 
cgit v1.2.3-70-g09d2