$NetBSD: patch-an,v 1.1 2006/06/15 03:44:07 jlam Exp $

--- common/gettext.h.orig	2004-11-20 21:52:22.000000000 -0500
+++ common/gettext.h
@@ -28,6 +28,11 @@
 /* Get declarations of GNU message catalog functions.  */
 # include <libintl.h>
 
+/* Remove any macros (possibly) defined by libintl.h that would
+   conflict with method names declared by common/ostream.hpp.  */
+# undef printf
+# undef vprintf
+
 #else
 
 /* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which