Update of /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/x11
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17409/gdk/x11
Modified Files:
Tag: OpenVRML-GtkPlug-BRANCH
Makefile.am gdkglconfig-x11.c gdkglquery-x11.c
Log Message:
Merged changes to GtkGLExt.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/x11/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** Makefile.am 27 Sep 2006 00:16:09 -0000 1.1.1.1
--- Makefile.am 27 Sep 2006 06:32:34 -0000 1.1.1.1.2.1
***************
*** 50,54 ****
gdkglextx11includedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gdk/x11
! gdkglextx11include_HEADERS = $(gdkglext_x11_headers)
noinst_LTLIBRARIES = libgdkglext-x11.la
--- 50,54 ----
gdkglextx11includedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gdk/x11
! noinst_HEADERS = $(gdkglext_x11_headers)
noinst_LTLIBRARIES = libgdkglext-x11.la
Index: gdkglconfig-x11.c
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/x11/gdkglconfig-x11.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** gdkglconfig-x11.c 27 Sep 2006 00:16:09 -0000 1.1.1.1
--- gdkglconfig-x11.c 27 Sep 2006 06:32:34 -0000 1.1.1.1.2.1
***************
*** 65,69 ****
sizeof (GdkGLConfigImplX11),
0, /* n_preallocs */
! (GInstanceInitFunc) NULL
};
--- 65,70 ----
sizeof (GdkGLConfigImplX11),
0, /* n_preallocs */
! (GInstanceInitFunc) NULL,
! (const GTypeValueTable *) NULL
};
Index: gdkglquery-x11.c
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/x11/gdkglquery-x11.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** gdkglquery-x11.c 27 Sep 2006 00:16:09 -0000 1.1.1.1
--- gdkglquery-x11.c 27 Sep 2006 06:32:34 -0000 1.1.1.1.2.1
***************
*** 406,410 ****
if (glx_get_proc_address != NULL)
{
! proc_address = glx_get_proc_address (proc_name);
GDK_GL_NOTE (IMPL, g_message (" ** glXGetProcAddress () - %s",
proc_address ? "succeeded" : "failed"));
--- 406,410 ----
if (glx_get_proc_address != NULL)
{
! proc_address = glx_get_proc_address ((const GLubyte *) proc_name);
GDK_GL_NOTE (IMPL, g_message (" ** glXGetProcAddress () - %s",
proc_address ? "succeeded" : "failed"));
|
