--- gettext-0.14.5/gettext-runtime/intl/libgnuintl.h.orig	2006-02-26 17:31:19.000000000 +1030
+++ gettext-0.14.5/gettext-runtime/intl/libgnuintl.h.in	2006-02-26 17:39:13.000000000 +1030
@@ -292,35 +292,47 @@
 # include <varargs.h>
 #endif
 
+#ifdef __cplusplus
+namespace std {
+#endif
+
 #undef fprintf
 #define fprintf libintl_fprintf
 extern int fprintf (FILE *, const char *, ...);
+extern int libintl_fprintf (FILE *, const char *, ...);
 #undef vfprintf
 #define vfprintf libintl_vfprintf
 extern int vfprintf (FILE *, const char *, va_list);
+extern int libintl_vfprintf (FILE *, const char *, va_list);
 
 #undef printf
 #define printf libintl_printf
 extern int printf (const char *, ...);
+extern int libintl_printf (const char *, ...);
 #undef vprintf
 #define vprintf libintl_vprintf
 extern int vprintf (const char *, va_list);
+extern int libintl_vprintf (const char *, va_list);
 
 #undef sprintf
 #define sprintf libintl_sprintf
 extern int sprintf (char *, const char *, ...);
+extern int libintl_sprintf (char *, const char *, ...);
 #undef vsprintf
 #define vsprintf libintl_vsprintf
 extern int vsprintf (char *, const char *, va_list);
+extern int libintl_vsprintf (char *, const char *, va_list);
 
 #if @HAVE_SNPRINTF@
 
 #undef snprintf
 #define snprintf libintl_snprintf
 extern int snprintf (char *, size_t, const char *, ...);
+extern int libintl_snprintf (char *, size_t, const char *, ...);
 #undef vsnprintf
 #define vsnprintf libintl_vsnprintf
 extern int vsnprintf (char *, size_t, const char *, va_list);
+extern int libintl_vsnprintf (char *, size_t, const char *, va_list);
 
 #endif
 
@@ -329,9 +341,11 @@
 #undef asprintf
 #define asprintf libintl_asprintf
 extern int asprintf (char **, const char *, ...);
+extern int libintl_asprintf (char **, const char *, ...);
 #undef vasprintf
 #define vasprintf libintl_vasprintf
 extern int vasprintf (char **, const char *, va_list);
+extern int libintl_vasprintf (char **, const char *, va_list);
 
 #endif
 
@@ -340,26 +354,36 @@
 #undef fwprintf
 #define fwprintf libintl_fwprintf
 extern int fwprintf (FILE *, const wchar_t *, ...);
+extern int libintl_fwprintf (FILE *, const wchar_t *, ...);
 #undef vfwprintf
 #define vfwprintf libintl_vfwprintf
 extern int vfwprintf (FILE *, const wchar_t *, va_list);
+extern int libintl_vfwprintf (FILE *, const wchar_t *, va_list);
 
 #undef wprintf
 #define wprintf libintl_wprintf
 extern int wprintf (const wchar_t *, ...);
+extern int libintl_wprintf (const wchar_t *, ...);
 #undef vwprintf
 #define vwprintf libintl_vwprintf
 extern int vwprintf (const wchar_t *, va_list);
+extern int libintl_vwprintf (const wchar_t *, va_list);
 
 #undef swprintf
 #define swprintf libintl_swprintf
 extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
+extern int libintl_swprintf (wchar_t *, size_t, const wchar_t *, ...);
 #undef vswprintf
 #define vswprintf libintl_vswprintf
 extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
+extern int libintl_vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
 
 #endif
 
+#ifdef __cplusplus
+}  // namspace std
+#endif
+
 #endif