summaryrefslogtreecommitdiff
path: root/ftparchive
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-05-05 15:37:31 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-05-05 15:37:31 +0200
commita00a9b44a1e0abf944d88c36ceaac8afdd207dcb (patch)
tree038dbe61e80ac809de33bb8fc3c74e24f7fb8be6 /ftparchive
parent7f5aab82708813d86aab04029095988f40a8462e (diff)
downloadapt-a00a9b44a1e0abf944d88c36ceaac8afdd207dcb.tar.gz
ensure that apti18n.h is included last as advertised (Closes: #671623)
Diffstat (limited to 'ftparchive')
-rw-r--r--ftparchive/cachedb.cc5
-rw-r--r--ftparchive/contents.cc4
-rw-r--r--ftparchive/override.cc3
3 files changed, 8 insertions, 4 deletions
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index a8b637a80..c2318bf53 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -19,11 +19,12 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/fileutl.h>
-
+
#include <netinet/in.h> // htonl, etc
-#include <apti18n.h>
#include "cachedb.h"
+
+#include <apti18n.h>
/*}}}*/
// CacheDB::ReadyDB - Ready the DB2 /*{{{*/
diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index bbc5a1e2b..015c790e0 100644
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -38,13 +38,15 @@
#include <apt-pkg/debfile.h>
#include <apt-pkg/extracttar.h>
#include <apt-pkg/error.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <malloc.h>
-#include <apti18n.h>
#include "contents.h"
+
+#include <apti18n.h>
/*}}}*/
// GenContents::~GenContents - Free allocated memory /*{{{*/
diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index d363fd0fe..760c20120 100644
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -12,13 +12,14 @@
// Include Files /*{{{*/
#include <config.h>
-#include <apti18n.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
#include <stdio.h>
#include "override.h"
+
+#include <apti18n.h>
/*}}}*/
// Override::ReadOverride - Read the override file /*{{{*/