diff options
| author | jlam <jlam> | 2006-06-15 03:44:07 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-06-15 03:44:07 +0000 |
| commit | cfc70a9126b0ebd5ca7f9a84f7413ef658fd2143 (patch) | |
| tree | af21a44a9492a3ff76221008059834be7de57434 /textproc/aspell/patches | |
| parent | 0e1188ba56ed9bb2bd714e6445cb3578cca4061b (diff) | |
| download | pkgsrc-cfc70a9126b0ebd5ca7f9a84f7413ef658fd2143.tar.gz | |
Welcome to the brave new world of gettext-0.14.5 -- if a source file
includes <libintl.h>, then it may also pull in macro redefintions for
all of the *printf() functions. Unfortunately, macros do not mix well
with C++ code which expects to be able to partition names, e.g. printf
and vprintf, into the class namespace. (Mostly) fix this problem by
undefining printf and vprintf after <libintl.h> is included. This
addresses PR pkg/33577.
Diffstat (limited to 'textproc/aspell/patches')
| -rw-r--r-- | textproc/aspell/patches/patch-an | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/textproc/aspell/patches/patch-an b/textproc/aspell/patches/patch-an new file mode 100644 index 00000000000..6e82d35a4ad --- /dev/null +++ b/textproc/aspell/patches/patch-an @@ -0,0 +1,16 @@ +$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 |