diff options
| author | markd <markd@pkgsrc.org> | 2008-04-01 22:50:24 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2008-04-01 22:50:24 +0000 |
| commit | bc46fa68bce38acdc0b01dc1bb992d7cebdb7b7d (patch) | |
| tree | 8d71478bcde852c92c64853e95e022d39ae03cd7 /net/kdenetwork3/patches | |
| parent | 22b689f027c2b6729ff850382cb864aaeb53b77d (diff) | |
| download | pkgsrc-bc46fa68bce38acdc0b01dc1bb992d7cebdb7b7d.tar.gz | |
Use <X11/Xmd.h> to define CARD32 et al so that local definition
doesn't clash if something else happens to pull in that include
file - as now happens with XI.h file in inputproto-1.4.3.
Should fix PR 38227.
Diffstat (limited to 'net/kdenetwork3/patches')
| -rw-r--r-- | net/kdenetwork3/patches/patch-am | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/net/kdenetwork3/patches/patch-am b/net/kdenetwork3/patches/patch-am index c696cfed7b8..19ac766c096 100644 --- a/net/kdenetwork3/patches/patch-am +++ b/net/kdenetwork3/patches/patch-am @@ -1,8 +1,19 @@ -$NetBSD: patch-am,v 1.4 2006/10/12 10:47:18 markd Exp $ +$NetBSD: patch-am,v 1.5 2008/04/01 22:50:24 markd Exp $ ---- krfb/libvncserver/rfb.h.orig 2003-07-21 19:38:18.000000000 +1200 +--- krfb/libvncserver/rfb.h.orig 2005-09-10 20:20:13.000000000 +1200 +++ krfb/libvncserver/rfb.h -@@ -62,7 +62,7 @@ typedef unsigned long KeySym; +@@ -38,9 +38,7 @@ extern "C" + #include "keysym.h" + + /* TODO: this stuff has to go into autoconf */ +-typedef unsigned char CARD8; +-typedef unsigned short CARD16; +-typedef unsigned int CARD32; ++#include <X11/Xmd.h> + typedef CARD32 Pixel; + /* typedef CARD32 KeySym; */ + #ifndef __osf__ +@@ -62,7 +60,7 @@ typedef unsigned long KeySym; #ifdef __linux__ #include <endian.h> @@ -11,7 +22,7 @@ $NetBSD: patch-am,v 1.4 2006/10/12 10:47:18 markd Exp $ #include <sys/types.h> #include <machine/endian.h> #ifndef _BYTE_ORDER -@@ -76,7 +76,7 @@ +@@ -76,7 +74,7 @@ typedef unsigned long KeySym; #if defined(__sparc) /* SPARC here (big endian) */ #define _BYTE_ORDER 4321 |