summaryrefslogtreecommitdiff
path: root/ftparchive
diff options
context:
space:
mode:
authorbubulle@debian.org <>2007-06-12 20:45:41 +0200
committerbubulle@debian.org <>2007-06-12 20:45:41 +0200
commit90a88b83020eb9526951eec83e3075b54653fa33 (patch)
tree96fee339221e3a8c5e02b28554465970d671b49c /ftparchive
parent8de27dc625e6a16b7be6eff6eec323cfe9bd9a57 (diff)
parent47026cdea6ba7d145922ce21d5ec478598126b8d (diff)
Sync with Michael
Reintegrate disappeared po/ku.po and po/uk.po then activate those translations
Diffstat (limited to 'ftparchive')
-rw-r--r--ftparchive/apt-ftparchive.cc5
-rw-r--r--ftparchive/apt-ftparchive.h3
-rw-r--r--ftparchive/cachedb.cc4
-rw-r--r--ftparchive/cachedb.h4
-rw-r--r--ftparchive/multicompress.cc4
-rw-r--r--ftparchive/multicompress.h4
-rw-r--r--ftparchive/override.cc4
-rw-r--r--ftparchive/override.h4
-rw-r--r--ftparchive/writer.cc4
-rw-r--r--ftparchive/writer.h3
10 files changed, 4 insertions, 35 deletions
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 0e2be8a00..290326ec3 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -10,10 +10,6 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-ftparchive.h"
-#endif
-
#include "apt-ftparchive.h"
#include <apt-pkg/error.h>
@@ -24,6 +20,7 @@
#include <apti18n.h>
#include <algorithm>
+#include <climits>
#include <sys/time.h>
#include <regex.h>
diff --git a/ftparchive/apt-ftparchive.h b/ftparchive/apt-ftparchive.h
index c364d670e..240cf9ba7 100644
--- a/ftparchive/apt-ftparchive.h
+++ b/ftparchive/apt-ftparchive.h
@@ -13,9 +13,6 @@
#ifndef APT_FTPARCHIVE_H
#define APT_FTPARCHIVE_H
-#ifdef __GNUG__
-#pragma interface "apt-ftparchive.h"
-#endif
#include <fstream>
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index 8a4ca0236..8de3a0b9e 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -10,10 +10,6 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "cachedb.h"
-#endif
-
#include "cachedb.h"
#include <apti18n.h>
diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index afa22213a..c10f41ecc 100644
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -12,9 +12,7 @@
#ifndef CACHEDB_H
#define CACHEDB_H
-#ifdef __GNUG__
-#pragma interface "cachedb.h"
-#endif
+
#include <db.h>
#include <string>
diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index a3512c787..935c98877 100644
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -14,10 +14,6 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "multicompress.h"
-#endif
-
#include "multicompress.h"
#include <apti18n.h>
diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h
index 444d8626f..a65077e73 100644
--- a/ftparchive/multicompress.h
+++ b/ftparchive/multicompress.h
@@ -16,9 +16,7 @@
#ifndef MULTICOMPRESS_H
#define MULTICOMPRESS_H
-#ifdef __GNUG__
-#pragma interface "multicompress.h"
-#endif
+
#include <string>
#include <apt-pkg/fileutl.h>
diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index b8b94843f..6f40bc865 100644
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -10,10 +10,6 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "override.h"
-#endif
-
#include "override.h"
#include <apti18n.h>
diff --git a/ftparchive/override.h b/ftparchive/override.h
index e64641776..f270556eb 100644
--- a/ftparchive/override.h
+++ b/ftparchive/override.h
@@ -12,9 +12,7 @@
#ifndef OVERRIDE_H
#define OVERRIDE_H
-#ifdef __GNUG__
-#pragma interface "override.h"
-#endif
+
#include <map>
#include <string>
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index ea242d6af..59107e02b 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -11,10 +11,6 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "writer.h"
-#endif
-
#include "writer.h"
#include <apti18n.h>
diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index 1d47d57ec..a4e4356f9 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -13,9 +13,6 @@
#ifndef WRITER_H
#define WRITER_H
-#ifdef __GNUG__
-#pragma interface "writer.h"
-#endif
#include <string>
#include <stdio.h>