summaryrefslogtreecommitdiff
path: root/buildlib
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2008-11-05 12:54:44 +0100
committerMichael Vogt <mvo@debian.org>2008-11-05 12:54:44 +0100
commit81c1659e78d9cae0ecdee331f16e86564adccf5d (patch)
tree883deeb538d7729b1bd7689c57f5ac9876d805a0 /buildlib
parent4d7e6ec35d52d093e9426378ab51f56be27d49d8 (diff)
parentf8b1274722522826650a37f87bf9e743b5bca337 (diff)
* Fix typos:
- apt-pkg/depcache.cc * Fix compilation warnings: - apt-pkg/acquire.cc - apt-pkg/versionmatch.cc * Compilation fixes and portability improvement for compiling APT against non-GNU libc (thanks to Martin Koeppe, closes: #392063): - buildlib/apti18n.h.in: + textdomain() and bindtextdomain() must not be visible when --disable-nls - buildlib/inttypes.h.in: undefine standard int*_t types - Append INTLLIBS to SLIBS: + cmdline/makefile + ftparchive/makefile + methods/makefile * doc/apt.conf.5.xml: - clarify whether configuration items of apt.conf are case-sensitive (thanks to Vincent McIntyre, closes: #345901)
Diffstat (limited to 'buildlib')
-rw-r--r--buildlib/apti18n.h.in2
-rw-r--r--buildlib/inttypes.h.in7
2 files changed, 9 insertions, 0 deletions
diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in
index a5b91b1ee..e7beceb09 100644
--- a/buildlib/apti18n.h.in
+++ b/buildlib/apti18n.h.in
@@ -18,6 +18,8 @@
#else
// apt will not use any gettext
# define setlocale(a, b)
+# define textdomain(a)
+# define bindtextdomain(a, b)
# define _(x) x
# define N_(x) x
#endif
diff --git a/buildlib/inttypes.h.in b/buildlib/inttypes.h.in
index 3be720794..3b43b7672 100644
--- a/buildlib/inttypes.h.in
+++ b/buildlib/inttypes.h.in
@@ -4,6 +4,13 @@
#include <config.h>
+#undef int32_t
+#undef uint32_t
+#undef int16_t
+#undef uint16_t
+#undef int8_t
+#undef uint8_t
+
/* Generate the fixed bit size types */
#if SIZEOF_INT == 4
typedef int int32_t;