summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog77
-rw-r--r--dpkg-deb/build.c1
-rw-r--r--dpkg-deb/extract.c1
-rw-r--r--dpkg-deb/info.c1
-rw-r--r--dpkg-deb/main.c1
-rw-r--r--dpkg-split/info.c1
-rw-r--r--dpkg-split/join.c1
-rw-r--r--dpkg-split/main.c1
-rw-r--r--dpkg-split/queue.c1
-rw-r--r--dpkg-split/split.c1
-rw-r--r--dselect/basecmds.cc1
-rw-r--r--dselect/baselist.cc1
-rw-r--r--dselect/basetop.cc1
-rw-r--r--dselect/bindings.cc1
-rw-r--r--dselect/curkeys.cc1
-rw-r--r--dselect/helpmsgs.cc1
-rw-r--r--dselect/main.cc1
-rw-r--r--dselect/methkeys.cc1
-rw-r--r--dselect/methlist.cc1
-rw-r--r--dselect/method.cc1
-rw-r--r--dselect/methparse.cc1
-rw-r--r--dselect/pkgcmds.cc1
-rw-r--r--dselect/pkgdepcon.cc1
-rw-r--r--dselect/pkgdisplay.cc1
-rw-r--r--dselect/pkginfo.cc1
-rw-r--r--dselect/pkgkeys.cc1
-rw-r--r--dselect/pkglist.cc1
-rw-r--r--dselect/pkgsublist.cc1
-rw-r--r--dselect/pkgtop.cc1
-rw-r--r--lib/cleanup.c1
-rw-r--r--lib/compression.c1
-rw-r--r--lib/database.c1
-rw-r--r--lib/dbmodify.c1
-rw-r--r--lib/dump.c1
-rw-r--r--lib/ehandle.c1
-rw-r--r--lib/fields.c2
-rw-r--r--lib/lock.c1
-rw-r--r--lib/log.c1
-rw-r--r--lib/md5.c1
-rw-r--r--lib/mlib.c1
-rw-r--r--lib/myopt-util.c1
-rw-r--r--lib/myopt.c1
-rw-r--r--lib/nfmalloc.c1
-rw-r--r--lib/parse.c1
-rw-r--r--lib/parsehelp.c1
-rw-r--r--lib/path.c2
-rw-r--r--lib/showpkg.c1
-rw-r--r--lib/string.c2
-rw-r--r--lib/subproc.c1
-rw-r--r--lib/tarfn.c3
-rw-r--r--lib/triglib.c1
-rw-r--r--lib/utils.c1
-rw-r--r--lib/varbuf.c1
-rw-r--r--lib/vercmp.c1
-rw-r--r--libcompat/compat.h36
-rw-r--r--src/archives.c1
-rw-r--r--src/cleanup.c1
-rw-r--r--src/configure.c1
-rw-r--r--src/depcon.c1
-rw-r--r--src/enquiry.c1
-rw-r--r--src/errors.c1
-rw-r--r--src/filesdb.c1
-rw-r--r--src/help.c1
-rw-r--r--src/main.c1
-rw-r--r--src/packages.c1
-rw-r--r--src/pkg-list.c1
-rw-r--r--src/pkg-show.c1
-rw-r--r--src/processarc.c1
-rw-r--r--src/query.c1
-rw-r--r--src/remove.c1
-rw-r--r--src/select.c1
-rw-r--r--src/trigcmd.c1
-rw-r--r--src/trigproc.c1
-rw-r--r--src/update.c1
74 files changed, 187 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 04e151313..a7e9bc894 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,82 @@
2008-09-14 Guillem Jover <guillem@debian.org>
+ * libcompat/compat.h: New file.
+ * dpkg-deb/build.c: Include <compat.h>.
+ * dpkg-deb/extract.c: Likewise.
+ * dpkg-deb/info.c: Likewise.
+ * dpkg-deb/main.c: Likewise.
+ * dpkg-split/info.c: Likewise.
+ * dpkg-split/join.c: Likewise.
+ * dpkg-split/main.c: Likewise.
+ * dpkg-split/queue.c: Likewise.
+ * dpkg-split/split.c: Likewise.
+ * dselect/basecmds.cc: Likewise.
+ * dselect/baselist.cc: Likewise.
+ * dselect/basetop.cc: Likewise.
+ * dselect/bindings.cc: Likewise.
+ * dselect/curkeys.cc: Likewise.
+ * dselect/helpmsgs.cc: Likewise.
+ * dselect/main.cc: Likewise.
+ * dselect/methkeys.cc: Likewise.
+ * dselect/methlist.cc: Likewise.
+ * dselect/method.cc: Likewise.
+ * dselect/methparse.cc: Likewise.
+ * dselect/pkgcmds.cc: Likewise.
+ * dselect/pkgdepcon.cc: Likewise.
+ * dselect/pkgdisplay.cc: Likewise.
+ * dselect/pkginfo.cc: Likewise.
+ * dselect/pkgkeys.cc: Likewise.
+ * dselect/pkglist.cc: Likewise.
+ * dselect/pkgsublist.cc: Likewise.
+ * dselect/pkgtop.cc: Likewise.
+ * lib/cleanup.c: Likewise.
+ * lib/compression.c: Likewise.
+ * lib/database.c: Likewise.
+ * lib/dbmodify.c: Likewise.
+ * lib/dump.c: Likewise.
+ * lib/ehandle.c: Likewise.
+ * lib/lock.c: Likewise.
+ * lib/log.c: Likewise.
+ * lib/md5.c: Likewise.
+ * lib/mlib.c: Likewise.
+ * lib/myopt-util.c: Likewise.
+ * lib/myopt.c: Likewise.
+ * lib/nfmalloc.c: Likewise.
+ * lib/parse.c: Likewise.
+ * lib/parsehelp.c: Likewise.
+ * lib/path.c: Likewise.
+ * lib/showpkg.c: Likewise.
+ * lib/string.c: Likewise.
+ * lib/subproc.c: Likewise.
+ * lib/triglib.c: Likewise.
+ * lib/utils.c: Likewise.
+ * lib/varbuf.c: Likewise.
+ * lib/vercmp.c: Likewise.
+ * src/archives.c: Likewise.
+ * src/cleanup.c: Likewise.
+ * src/configure.c: Likewise.
+ * src/depcon.c: Likewise.
+ * src/enquiry.c: Likewise.
+ * src/errors.c: Likewise.
+ * src/filesdb.c: Likewise.
+ * src/help.c: Likewise.
+ * src/main.c: Likewise.
+ * src/packages.c: Likewise.
+ * src/pkg-list.c: Likewise.
+ * src/pkg-show.c: Likewise.
+ * src/processarc.c: Likewise.
+ * src/query.c: Likewise.
+ * src/remove.c: Likewise.
+ * src/select.c: Likewise.
+ * src/trigcmd.c: Likewise.
+ * src/trigproc.c: Likewise.
+ * src/update.c: Likewise.
+ * lib/fields.c: Likewise. Do not include "strnlen.h", now implicitly
+ included by <compat.h>.
+ * lib/tarfn.c: Likewise.
+
+2008-09-14 Guillem Jover <guillem@debian.org>
+
* lib/dpkg.h: Move <locale.h> inclusion and standard_startup locale
setup to ...
* dpkg-deb/main.c (main): ... here.
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index 100458f7b..2f0673127 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -21,6 +21,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index b7f67adbb..1d13c66a1 100644
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c
index 9e7bb72d2..3d97742de 100644
--- a/dpkg-deb/info.c
+++ b/dpkg-deb/info.c
@@ -20,6 +20,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 556d6c506..22f9f8158 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dpkg-split/info.c b/dpkg-split/info.c
index d3130bd5c..2ae72f639 100644
--- a/dpkg-split/info.c
+++ b/dpkg-split/info.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dpkg-split/join.c b/dpkg-split/join.c
index 0a6b798d7..48c18b5b9 100644
--- a/dpkg-split/join.c
+++ b/dpkg-split/join.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dpkg-split/main.c b/dpkg-split/main.c
index 71917c427..ab509e84a 100644
--- a/dpkg-split/main.c
+++ b/dpkg-split/main.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dpkg-split/queue.c b/dpkg-split/queue.c
index 2559ab8ed..42b2336bc 100644
--- a/dpkg-split/queue.c
+++ b/dpkg-split/queue.c
@@ -28,6 +28,7 @@
* all numbers in hex
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dpkg-split/split.c b/dpkg-split/split.c
index 2b49424e0..98d3cc196 100644
--- a/dpkg-split/split.c
+++ b/dpkg-split/split.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dselect/basecmds.cc b/dselect/basecmds.cc
index 771069cd3..08b105088 100644
--- a/dselect/basecmds.cc
+++ b/dselect/basecmds.cc
@@ -21,6 +21,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index d65770e68..e75626348 100644
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -21,6 +21,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dselect/basetop.cc b/dselect/basetop.cc
index 84642ddf9..83e6185e7 100644
--- a/dselect/basetop.cc
+++ b/dselect/basetop.cc
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <stdio.h>
#include <string.h>
diff --git a/dselect/bindings.cc b/dselect/bindings.cc
index dcac3b4ae..ece6ce4e1 100644
--- a/dselect/bindings.cc
+++ b/dselect/bindings.cc
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dselect/curkeys.cc b/dselect/curkeys.cc
index 241d0d9c6..e16440c29 100644
--- a/dselect/curkeys.cc
+++ b/dselect/curkeys.cc
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg.h>
#include <dpkg-db.h>
diff --git a/dselect/helpmsgs.cc b/dselect/helpmsgs.cc
index f9291ff5b..d17a4ca6d 100644
--- a/dselect/helpmsgs.cc
+++ b/dselect/helpmsgs.cc
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dselect/main.cc b/dselect/main.cc
index 69019139e..e68d4ca46 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -21,6 +21,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dselect/methkeys.cc b/dselect/methkeys.cc
index 196db38f0..0249ea2ff 100644
--- a/dselect/methkeys.cc
+++ b/dselect/methkeys.cc
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <stdio.h>
#include <string.h>
diff --git a/dselect/methlist.cc b/dselect/methlist.cc
index cd5668b4d..d582e1c86 100644
--- a/dselect/methlist.cc
+++ b/dselect/methlist.cc
@@ -21,6 +21,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dselect/method.cc b/dselect/method.cc
index a5d6aa1ea..1ab2ccae9 100644
--- a/dselect/method.cc
+++ b/dselect/method.cc
@@ -21,6 +21,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dselect/methparse.cc b/dselect/methparse.cc
index 875fdce7b..8cf91298d 100644
--- a/dselect/methparse.cc
+++ b/dselect/methparse.cc
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dselect/pkgcmds.cc b/dselect/pkgcmds.cc
index d20b4a879..31fe2ddbb 100644
--- a/dselect/pkgcmds.cc
+++ b/dselect/pkgcmds.cc
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <stdio.h>
#include <string.h>
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index 4b41961e3..a9c43f45d 100644
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <stdio.h>
#include <string.h>
diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index 0d60ca3e5..a09ad024e 100644
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dselect/pkginfo.cc b/dselect/pkginfo.cc
index 44e63dbf7..8e5a6a4c6 100644
--- a/dselect/pkginfo.cc
+++ b/dselect/pkginfo.cc
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dselect/pkgkeys.cc b/dselect/pkgkeys.cc
index c2f088cf2..5bf69020a 100644
--- a/dselect/pkgkeys.cc
+++ b/dselect/pkgkeys.cc
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <stdio.h>
#include <string.h>
diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index baf7c934f..31c0d875e 100644
--- a/dselect/pkglist.cc
+++ b/dselect/pkglist.cc
@@ -21,6 +21,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc
index ad602776d..40f257a76 100644
--- a/dselect/pkgsublist.cc
+++ b/dselect/pkgsublist.cc
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc
index c2dda3b2c..21a2cb42a 100644
--- a/dselect/pkgtop.cc
+++ b/dselect/pkgtop.cc
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/cleanup.c b/lib/cleanup.c
index 2820cee97..684501d9a 100644
--- a/lib/cleanup.c
+++ b/lib/cleanup.c
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg.h>
#include <stdio.h>
diff --git a/lib/compression.c b/lib/compression.c
index 81ac49960..13c2a9fc2 100644
--- a/lib/compression.c
+++ b/lib/compression.c
@@ -1,4 +1,5 @@
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/database.c b/lib/database.c
index 97424ce05..d01445222 100644
--- a/lib/database.c
+++ b/lib/database.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/dbmodify.c b/lib/dbmodify.c
index 430a0167f..947dcf777 100644
--- a/lib/dbmodify.c
+++ b/lib/dbmodify.c
@@ -20,6 +20,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/dump.c b/lib/dump.c
index 353238eca..d136532dd 100644
--- a/lib/dump.c
+++ b/lib/dump.c
@@ -22,6 +22,7 @@
/* FIXME: don't write uninteresting packages */
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/ehandle.c b/lib/ehandle.c
index bb056fbf0..39636d085 100644
--- a/lib/ehandle.c
+++ b/lib/ehandle.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/fields.c b/lib/fields.c
index 42a7062ea..31c9ae365 100644
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -20,13 +20,13 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>
-#include "strnlen.h"
#include <dpkg.h>
#include <dpkg-db.h>
diff --git a/lib/lock.c b/lib/lock.c
index 0148bd07a..9a1cc11d0 100644
--- a/lib/lock.c
+++ b/lib/lock.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/log.c b/lib/log.c
index bd08ba619..c5428efb1 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/md5.c b/lib/md5.c
index 5e5a5f22d..7e89868ee 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -21,6 +21,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <string.h> /* for memcpy() */
#include <sys/types.h> /* for stupid systems */
diff --git a/lib/mlib.c b/lib/mlib.c
index c13819125..9fde251ab 100644
--- a/lib/mlib.c
+++ b/lib/mlib.c
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/myopt-util.c b/lib/myopt-util.c
index 4f494558c..2e9c8256f 100644
--- a/lib/myopt-util.c
+++ b/lib/myopt-util.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/myopt.c b/lib/myopt.c
index fd4c14ea0..2a1fbf31e 100644
--- a/lib/myopt.c
+++ b/lib/myopt.c
@@ -20,6 +20,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/nfmalloc.c b/lib/nfmalloc.c
index b9ebdd21c..a6950a856 100644
--- a/lib/nfmalloc.c
+++ b/lib/nfmalloc.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/parse.c b/lib/parse.c
index b66975539..a6c53b474 100644
--- a/lib/parse.c
+++ b/lib/parse.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/parsehelp.c b/lib/parsehelp.c
index 9d376359e..b740198e8 100644
--- a/lib/parsehelp.c
+++ b/lib/parsehelp.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/path.c b/lib/path.c
index 3152b26db..54ca5e77c 100644
--- a/lib/path.c
+++ b/lib/path.c
@@ -21,6 +21,8 @@
*/
#include <config.h>
+#include <compat.h>
+
#include <string.h>
#include <dpkg-priv.h>
diff --git a/lib/showpkg.c b/lib/showpkg.c
index e924951ec..219b31228 100644
--- a/lib/showpkg.c
+++ b/lib/showpkg.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/string.c b/lib/string.c
index b110d0235..b8a9bb0b6 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -21,6 +21,8 @@
*/
#include <config.h>
+#include <compat.h>
+
#include <dpkg-priv.h>
char *
diff --git a/lib/subproc.c b/lib/subproc.c
index ec3b0db22..009b9f26b 100644
--- a/lib/subproc.c
+++ b/lib/subproc.c
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/tarfn.c b/lib/tarfn.c
index 970039036..bdf0bb0c1 100644
--- a/lib/tarfn.c
+++ b/lib/tarfn.c
@@ -5,6 +5,7 @@
* This is free software under the GNU General Public License.
*/
#include <config.h>
+#include <compat.h>
#include <stdlib.h>
#include <string.h>
@@ -17,8 +18,6 @@
#include <dpkg.h>
#include <dpkg-priv.h>
-#include "strnlen.h"
-
struct TarHeader {
char Name[100];
char Mode[8];
diff --git a/lib/triglib.c b/lib/triglib.c
index 8581ac46c..6e54ac456 100644
--- a/lib/triglib.c
+++ b/lib/triglib.c
@@ -21,6 +21,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/lib/utils.c b/lib/utils.c
index 5d7728902..1ef38d02e 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -19,6 +19,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
#include <dpkg.h>
diff --git a/lib/varbuf.c b/lib/varbuf.c
index 763cdcffe..71068a817 100644
--- a/lib/varbuf.c
+++ b/lib/varbuf.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/vercmp.c b/lib/vercmp.c
index 8cdd39700..dd6503106 100644
--- a/lib/vercmp.c
+++ b/lib/vercmp.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <ctype.h>
#include <string.h>
diff --git a/libcompat/compat.h b/libcompat/compat.h
new file mode 100644
index 000000000..6c3a04739
--- /dev/null
+++ b/libcompat/compat.h
@@ -0,0 +1,36 @@
+/*
+ * libcompat - system compatibility library
+ * compat.h - system compatibility declarations
+ *
+ * Copyright © 2008 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with dpkg; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef COMPAT_H
+#define COMPAT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <strnlen.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* COMPAT_H */
+
diff --git a/src/archives.c b/src/archives.c
index 3e01f1c1e..9e13fcc91 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -20,6 +20,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/cleanup.c b/src/cleanup.c
index 0892a5bce..5d0edc194 100644
--- a/src/cleanup.c
+++ b/src/cleanup.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/configure.c b/src/configure.c
index 244fe71d2..c57f94771 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -20,6 +20,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/depcon.c b/src/depcon.c
index b206698d2..34d428d4a 100644
--- a/src/depcon.c
+++ b/src/depcon.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/enquiry.c b/src/enquiry.c
index 334f45276..c708efaa4 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -21,6 +21,7 @@
/* FIXME: per-package audit */
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/errors.c b/src/errors.c
index c90c159db..bd0d2a3f7 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/filesdb.c b/src/filesdb.c
index 4c06e5271..e1de2e03e 100644
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -20,6 +20,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/help.c b/src/help.c
index a486c470b..4349f7b6c 100644
--- a/src/help.c
+++ b/src/help.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/main.c b/src/main.c
index 6dd216ed7..0dcbe874e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/packages.c b/src/packages.c
index ba54071d3..e46f4eac0 100644
--- a/src/packages.c
+++ b/src/packages.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/pkg-list.c b/src/pkg-list.c
index c29fa0732..9204e7787 100644
--- a/src/pkg-list.c
+++ b/src/pkg-list.c
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <string.h>
diff --git a/src/pkg-show.c b/src/pkg-show.c
index fdf0ed4fb..d42180115 100644
--- a/src/pkg-show.c
+++ b/src/pkg-show.c
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/processarc.c b/src/processarc.c
index f8f9f4a99..c8c8f8b25 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/query.c b/src/query.c
index 98ecdaf27..25be61bfe 100644
--- a/src/query.c
+++ b/src/query.c
@@ -20,6 +20,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/remove.c b/src/remove.c
index 2f70727a5..f19c6c0a9 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/select.c b/src/select.c
index 637533050..13e10af1a 100644
--- a/src/select.c
+++ b/src/select.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/trigcmd.c b/src/trigcmd.c
index 1f84418fa..dac0ac59f 100644
--- a/src/trigcmd.c
+++ b/src/trigcmd.c
@@ -20,6 +20,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/trigproc.c b/src/trigproc.c
index e9072e952..650384932 100644
--- a/src/trigproc.c
+++ b/src/trigproc.c
@@ -21,6 +21,7 @@
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>
diff --git a/src/update.c b/src/update.c
index ab289d4d0..cba775b7e 100644
--- a/src/update.c
+++ b/src/update.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <config.h>
+#include <compat.h>
#include <dpkg-i18n.h>