[kaffe] CVS kaffe (dalibor): Only include XShm.h if it exists

Kaffe CVS cvs-commits at kaffe.org
Thu Jun 10 12:49:06 PDT 2004


PatchSet 4837 
Date: 2004/06/10 19:18:10
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Only include XShm.h if it exists

2004-06-10  Dalibor Topic  <robilad at kaffe.org>,

        * libraries/clib/awt/X/toolkit.h:
        Only include XShm.h if it actually exists.
        Apparently parisc-hpux doesn't have the header.

        Reported by: Riccardo Mottola  <zuse at libero.it>

Members: 
	ChangeLog:1.2404->1.2405 
	libraries/clib/awt/X/toolkit.h:1.31->1.32 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2404 kaffe/ChangeLog:1.2405
--- kaffe/ChangeLog:1.2404	Thu Jun 10 18:19:24 2004
+++ kaffe/ChangeLog	Thu Jun 10 19:18:10 2004
@@ -1,4 +1,12 @@
 2004-06-10  Dalibor Topic  <robilad at kaffe.org>,
+
+	* libraries/clib/awt/X/toolkit.h:
+	Only include XShm.h if it actually exists.
+	Apparently parisc-hpux doesn't have the header.
+
+        Reported by: Riccardo Mottola  <zuse at libero.it>
+
+2004-06-10  Dalibor Topic  <robilad at kaffe.org>,
 	    Julian Scheid <julian at sektor37.de>
 
         * configure.ac:
Index: kaffe/libraries/clib/awt/X/toolkit.h
diff -u kaffe/libraries/clib/awt/X/toolkit.h:1.31 kaffe/libraries/clib/awt/X/toolkit.h:1.32
--- kaffe/libraries/clib/awt/X/toolkit.h:1.31	Fri May 28 13:40:11 2004
+++ kaffe/libraries/clib/awt/X/toolkit.h	Thu Jun 10 19:18:12 2004
@@ -24,7 +24,9 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #if defined(HAVE_LIBXEXT)
+#if defined(HAVE_X11_EXTENSIONS_XSHM_H)
 #include <X11/extensions/XShm.h>
+#endif /* defined(HAVE_X11_EXTENSIONS_XSHM_H) */
 #else
 // #undef USE_XSHM_EXTENSION
 #define	XShmGetImage(A,B,C,D,E,F)		0




More information about the kaffe mailing list