merged from debian-sid

3 files changed, 10 insertions, 1 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/copy.mak b/buildlib/copy.mak
index 15f448827..3ae11a7eb 100644
--- a/buildlib/copy.mak
+++ b/buildlib/copy.mak
@@ -1,6 +1,6 @@
 # -*- make -*-
 
-# This installs arbitary files into a directory
+# This installs arbitrary files into a directory
 
 # Input
 # $(SOURCE) - The documents to use
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;