Index: ChangeLog
===================================================================
RCS file: /cvsroot/xforms/xforms/ChangeLog,v
retrieving revision 1.107
diff -u -p -r1.107 ChangeLog
--- ChangeLog	14 May 2004 21:23:09 -0000	1.107
+++ ChangeLog	17 May 2004 10:59:03 -0000
@@ -1,3 +1,8 @@
+2004-05-17  Angus Leeming  <angus.leeming@btopenworld.com>
+
+	* lib/include/canvas.h: change the change to AUTOINCLUDE_GLCANVAS_H.
+	* gl/glcanvas.h: #include <GL/glx.h>. Add C++ guards.
+
 2004-05-14  Angus Leeming  <angus.leeming@btopenworld.com>
 
 	* lib/include/canvas.h: add a preprocessor-qualified #include
Index: gl/glcanvas.h
===================================================================
RCS file: /cvsroot/xforms/xforms/gl/glcanvas.h,v
retrieving revision 1.3
diff -u -p -r1.3 glcanvas.h
--- gl/glcanvas.h	20 Nov 2003 11:06:49 -0000	1.3
+++ gl/glcanvas.h	17 May 2004 10:59:03 -0000
@@ -1,6 +1,13 @@
 #ifndef FL_GLCANVAS_H
 #define FL_GLCANVAS_H
 
+#if defined(__cplusplus)
+extern "C"
+{
+#endif
+
+#include <GL/glx.h>
+
 /* OpenGL canvases */
 FL_EXPORT FL_OBJECT *fl_create_glcanvas(
 		int type,
@@ -71,5 +78,9 @@ FL_EXPORT Window fl_glwinopen(
 		int w,
 		int h
 		);
+
+#if defined(__cplusplus)
+}
+#endif
 
 #endif /* NOT FL_GLCANVAS_H */
Index: lib/include/canvas.h
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/include/canvas.h,v
retrieving revision 1.4
diff -u -p -r1.4 canvas.h
--- lib/include/canvas.h	14 May 2004 21:23:10 -0000	1.4
+++ lib/include/canvas.h	17 May 2004 10:59:03 -0000
@@ -175,10 +175,10 @@ FL_EXPORT void fl_canvas_yield_to_shortc
 
 /* This is an attempt to maintain some sort of backwards compatibility
  * with old code whilst also getting rid of the old, system-specific
- * hack. Angus 14 May, 2004. 
+ * hack.
  */
-#ifdef GLCANVAS_H_LOCATION
-#include GLCANVAS_H_LOCATION
+#ifdef AUTOINCLUDE_GLCANVAS_H
+#include <glcanvas.h>
 #endif
 
 #endif