From dd10d60c78c3063c96fac293ac9a6b5b1588dee2 Mon Sep 17 00:00:00 2001 From: sketch Date: Fri, 19 Dec 2003 11:32:52 +0000 Subject: Work around a bug in certain versions of Xmd.h which do not correctly check for __STDC__, breaking the SIZEOF() macro. --- x11/render/distinfo | 3 ++- x11/render/patches/patch-aa | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 x11/render/patches/patch-aa diff --git a/x11/render/distinfo b/x11/render/distinfo index 8cd09bc646b..86594df7b3b 100644 --- a/x11/render/distinfo +++ b/x11/render/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/09/19 16:33:57 wiz Exp $ +$NetBSD: distinfo,v 1.2 2003/12/19 11:32:52 sketch Exp $ SHA1 (render-0.8.tar.gz) = 73b88307fd318e0a1a7ed50c7cf7808d550cca99 Size (render-0.8.tar.gz) = 51478 bytes +SHA1 (patch-aa) = 44f9efe2d49e07b7ff344034f7369fd10dada464 diff --git a/x11/render/patches/patch-aa b/x11/render/patches/patch-aa new file mode 100644 index 00000000000..7da280964ac --- /dev/null +++ b/x11/render/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.1 2003/12/19 11:32:52 sketch Exp $ + +--- renderproto.h.orig 2003-04-21 18:19:22.000000000 +0100 ++++ renderproto.h 2003-12-16 15:32:39.752161000 +0000 +@@ -29,6 +29,17 @@ + #include + #include + ++/* Work around bug in -r1.47 of XConsortium: Xmd.h, which breaks packages ++ * dependant on x11/render for certain versions of OpenWindows */ ++#undef _SIZEOF ++#undef SIZEOF ++#if ((defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)) && !defined(UNIXCPP)) || defined(ANSICPP) || defined(_LP64) ++#define _SIZEOF(x) sz_##x ++#define SIZEOF(x) _SIZEOF(x) ++#else ++#define SIZEOF(x) sz_/**/x ++#endif ++ + #define Window CARD32 + #define Drawable CARD32 + #define Font CARD32 -- cgit v1.2.3