summaryrefslogtreecommitdiff
path: root/apt-inst/deb
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 17:04:52 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 17:04:52 +0000
commitd77559acad5da864e764aef8aed08046e4d38ed4 (patch)
tree4e68993ea7784566eb95f87aeb25af406149992a /apt-inst/deb
parent57dd614d0e8a103285357a9576261744dce39199 (diff)
* 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)
Diffstat (limited to 'apt-inst/deb')
-rw-r--r--apt-inst/deb/debfile.cc4
-rw-r--r--apt-inst/deb/dpkgdb.cc4
2 files changed, 4 insertions, 4 deletions
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;