From 22d8256602797db24351d10a84fe260cf1520e14 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 6 Nov 2005 17:05:12 +0000
Subject: [PATCH] Date: Sun, 06 Nov 2005 18:23:03 +0900 From: Hayashi Naoyuki
 <titan@culzean.org> To: "A list for developers using the SDL library.
 \(includes SDL-announce\)" <sdl@libsdl.org> Subject: Re: [SDL] Dynamic X11...

1. Compilation produce the following error on Tru64 UNIX.
cc: Severe: SDL_x11dyn.h, line 31: Cannot find file
<X11/extensions/extutil.h> specified in #include directive. (noinclfilef)
#include <X11/extensions/extutil.h>

Because Tru64 UNIX doesn't have extutil.h, this error is caused.


2. Compilation with --enable-x11-shared=no produce the following error.
cc: Error: SDL_x11sym.h, line 115: In this statement,
"Xutf8TextListToTextProperty" is not declared. (undeclared)
SDL_X11_SYM(int,Xutf8TextListToTextProperty,(Display*,char**,int,XICCEncodingStyle,XTextProperty*))

Though it doesn't have Xutf8TextListToTextProperty,
"pXutf8TextListToTextProperty = Xutf8TextListToTextProperty;"
in SDL_x11dyn.c,117-119
#define SDL_X11_SYM(r,fn,arg) p##fn = fn;
#include "SDL_x11sym.h"
#undef SDL_X11_SYM


-- Hayashi Naoyuki Key fingerprint = 60A0 D5D3 F58B 3633 2E52 0147 D17F 5578 3FDF F5B6
---
 src/video/x11/SDL_x11dyn.h | 5 +++++
 src/video/x11/SDL_x11sym.h | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/video/x11/SDL_x11dyn.h b/src/video/x11/SDL_x11dyn.h
index 6104635f6..374d951bc 100644
--- a/src/video/x11/SDL_x11dyn.h
+++ b/src/video/x11/SDL_x11dyn.h
@@ -28,7 +28,12 @@
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 #include <X11/Xlibint.h>
+
+#if defined(__osf__)
+#include <XFree86/extensions/extutil.h>
+#else
 #include <X11/extensions/extutil.h>
+#endif
 
 #ifndef NO_SHARED_MEMORY
 #include <sys/ipc.h>
diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h
index 2ccc4b864..f3ce77dc1 100644
--- a/src/video/x11/SDL_x11sym.h
+++ b/src/video/x11/SDL_x11sym.h
@@ -112,7 +112,9 @@ SDL_X11_SYM(XExtensionInfo*,XextCreateExtension,(void))
 SDL_X11_SYM(void,XextDestroyExtension,(XExtensionInfo*))
 SDL_X11_SYM(XExtDisplayInfo*,XextFindDisplay,(XExtensionInfo*,Display*))
 SDL_X11_SYM(int,XextRemoveDisplay,(XExtensionInfo*,Display*))
+#ifdef X_HAVE_UTF8_STRING
 SDL_X11_SYM(int,Xutf8TextListToTextProperty,(Display*,char**,int,XICCEncodingStyle,XTextProperty*))
+#endif
 SDL_X11_SYM(void,_XEatData,(Display*,unsigned long))
 SDL_X11_SYM(void,_XFlush,(Display*))
 SDL_X11_SYM(void,_XFlushGCCache,(Display*,GC))