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/deb/debfile.cc | 4 ++--
 apt-inst/deb/dpkgdb.cc  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'apt-inst/deb')

diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index 5c8339637..d3a39911d 100644
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: debfile.cc,v 1.3 2003/02/10 00:36:12 doogie Exp $
+// $Id: debfile.cc,v 1.4 2004/01/07 20:39:37 mdz Exp $
 /* ######################################################################
 
    Debian Archive File (.deb)
@@ -20,7 +20,6 @@
 #pragma implementation "apt-pkg/debfile.h"
 #endif
 
-#include <apti18n.h>
 #include <apt-pkg/debfile.h>
 #include <apt-pkg/extracttar.h>
 #include <apt-pkg/error.h>
@@ -28,6 +27,7 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
+#include <apti18n.h>
 									/*}}}*/
 
 // DebFile::debDebFile - Constructor					/*{{{*/
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc
index f71811a9b..d06ff6353 100644
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: dpkgdb.cc,v 1.7 2003/02/10 00:36:12 doogie Exp $
+// $Id: dpkgdb.cc,v 1.8 2004/01/07 20:39:37 mdz Exp $
 /* ######################################################################
 
    DPKGv1 Database Implemenation
@@ -17,7 +17,6 @@
 #pragma implementation "apt-pkg/dpkgdb.h"
 #endif
 
-#include <apti18n.h>
 #include <apt-pkg/dpkgdb.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
@@ -33,6 +32,7 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <iostream>
+#include <apti18n.h>
 									/*}}}*/
 using namespace std;
 
-- 
cgit v1.2.3