diff options
| author | dholland <dholland@pkgsrc.org> | 2011-10-03 04:45:40 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2011-10-03 04:45:40 +0000 |
| commit | 55e2a2073933add81b98a42073bd691349c466a4 (patch) | |
| tree | eb9a5f3774fd181709af8896b7160b16908c7b1f /emulators/xbeeb | |
| parent | efaad988e5d8743ce438332bddb32b271b5843dd (diff) | |
| download | pkgsrc-55e2a2073933add81b98a42073bd691349c466a4.tar.gz | |
It is evil for header files to check the include guards of other files
to decide what to declare. It is much more evil to do this when the
other include file belongs to someone else. Teach this to check the
other possible include guard for Xlib.h. Fixes NetBSD native X build.
Diffstat (limited to 'emulators/xbeeb')
| -rw-r--r-- | emulators/xbeeb/distinfo | 3 | ||||
| -rw-r--r-- | emulators/xbeeb/patches/patch-src_Screen_h | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/emulators/xbeeb/distinfo b/emulators/xbeeb/distinfo index 5339fdf79fd..1f8f37749a4 100644 --- a/emulators/xbeeb/distinfo +++ b/emulators/xbeeb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2009/02/13 10:08:40 abs Exp $ +$NetBSD: distinfo,v 1.9 2011/10/03 04:45:40 dholland Exp $ SHA1 (BASIC2.rom) = 4a7393f3a45ea309f744441c16723e2ef447a281 RMD160 (BASIC2.rom) = 2179cda4734227556bac230346cacd805e4e03a4 @@ -15,3 +15,4 @@ SHA1 (patch-ad) = 733916029e94e65ee7702778ce344468ab3cf658 SHA1 (patch-ae) = 00906d13e5dd9ec03f011053e7399fac581efc3d SHA1 (patch-af) = 62c888cc324742142d7a95c9db55067daba4dacd SHA1 (patch-ag) = 85f2cd6bddabfa865ab392d38c3a4db7cd2a8026 +SHA1 (patch-src_Screen_h) = f20e027cee77f37eeb08f8b0580ff30f6c2dd8ee diff --git a/emulators/xbeeb/patches/patch-src_Screen_h b/emulators/xbeeb/patches/patch-src_Screen_h new file mode 100644 index 00000000000..7cea3e2c8e0 --- /dev/null +++ b/emulators/xbeeb/patches/patch-src_Screen_h @@ -0,0 +1,16 @@ +$NetBSD: patch-src_Screen_h,v 1.1 2011/10/03 04:45:40 dholland Exp $ + +Since this wants to know about the private symbol used by Xlib.h as an +include guard, make sure it knows about both forms. + +--- src/Screen.h~ 2002-01-15 15:46:43.000000000 +0000 ++++ src/Screen.h +@@ -92,7 +92,7 @@ extern void RecalculateScreenInfo ( vo + extern unsigned char ScreenMemoryChanged; + extern unsigned char ScreenImageChanged; + +-#ifdef _XLIB_H_ ++#if defined(_XLIB_H_) || defined(_X11_XLIB_H_) + + extern GC TtextTextGC; + extern GC TtextMosaicGC; |