diff options
Diffstat (limited to 'graphics/camlimages/patches/patch-src_tiffwrite.c')
| -rw-r--r-- | graphics/camlimages/patches/patch-src_tiffwrite.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/graphics/camlimages/patches/patch-src_tiffwrite.c b/graphics/camlimages/patches/patch-src_tiffwrite.c new file mode 100644 index 00000000000..c515c38b288 --- /dev/null +++ b/graphics/camlimages/patches/patch-src_tiffwrite.c @@ -0,0 +1,28 @@ +$NetBSD: patch-src_tiffwrite.c,v 1.1.2.2 2012/07/31 15:12:03 tron Exp $ + +Both ocaml/caml/config.h and tiff.h define int32, uint32, etc. +The workaround of this name polution is to intentionally overwrite the +first caml definition with a garbage macro before tiff.h is included and +then unset it after the include. After tiff version 4.0.1, the same hack +has to be applied to 64-bit types + +--- src/tiffwrite.c.orig 2011-06-22 18:04:32.000000000 +0000 ++++ src/tiffwrite.c +@@ -25,6 +25,8 @@ + #define uint16 uint16tiff + #define int32 int32tiff + #define uint32 uint32tiff ++#define int64 int64tiff ++#define uint64 uint64tiff + + #include <tiffio.h> + +@@ -32,6 +34,8 @@ + #undef uint16 + #undef int32 + #undef uint32 ++#undef int64 ++#undef uint64 + + extern value *imglib_error; + |