summaryrefslogtreecommitdiff
path: root/buildlib
diff options
context:
space:
mode:
authorEugene V. Lyubimkin <jackyf@1501-debian>2008-11-05 23:10:30 +0200
committerEugene V. Lyubimkin <jackyf@1501-debian>2008-11-05 23:10:30 +0200
commit1ac90757e7d31b21fca7ddf7eb48cfc548b3ffb3 (patch)
tree883deeb538d7729b1bd7689c57f5ac9876d805a0 /buildlib
parent40a6cfced93c564bedea27554427c91fa6eff08c (diff)
parent81c1659e78d9cae0ecdee331f16e86564adccf5d (diff)
Merged with debian-sid.
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;