changed glXCopyContext()'s mask to unsigned long

diff --git a/include/GL/glx.h b/include/GL/glx.h
index b9c494697eaa3efa7da4406ecadc0265cef46f65..d54a6684f644f3f1ef3afafad741f916623de2b5 100644 (file)
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -1,10 +1,10 @@
-/* $Id: glx.h,v 1.10 1999/12/11 09:54:33 brianp Exp $ */
+/* $Id: glx.h,v 1.11 2000/02/23 23:04:27 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -225,7 +225,7 @@ extern Bool glXMakeCurrent( Display *dpy, GLXDrawable drawable,
                            GLXContext ctx);
 
 extern void glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
-                           GLuint mask );
+                           unsigned long mask );
 
 extern void glXSwapBuffers( Display *dpy, GLXDrawable drawable );
 

diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index fad572f090134e101e118df51ff8748be4a2f8d7..fd57fba7ee444c3d2247a4c30b8e9afa1c19ff08 100644 (file)
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,4 +1,4 @@
-/* $Id: fakeglx.c,v 1.21 2000/01/27 16:45:50 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.22 2000/02/23 23:09:12 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1207,12 +1207,12 @@ Fake_glXDestroyGLXPixmap( Display *dpy, GLXPixmap pixmap )
 
 static void
 Fake_glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
-                     GLuint mask )
+                     unsigned long mask )
 {
    XMesaContext xm_src = (XMesaContext) src;
    XMesaContext xm_dst = (XMesaContext) dst;
    (void) dpy;
-   gl_copy_context( xm_src->gl_ctx, xm_dst->gl_ctx, mask );
+   gl_copy_context( xm_src->gl_ctx, xm_dst->gl_ctx, (GLuint) mask );
 }
 
 

diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index 2bbe879f95333373d7fbeb35c76e7e5cb5fdd357..f46e36062b296dfebb4e84a33ec16b34d88d804f 100644 (file)
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -1,4 +1,4 @@
-/* $Id: glxapi.c,v 1.10 1999/12/10 15:16:49 brianp Exp $ */
+/* $Id: glxapi.c,v 1.11 2000/02/23 23:09:12 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -169,7 +169,8 @@ XVisualInfo *glXChooseVisual(Display *dpy, int screen, int *list)
 }
 
 
-void glXCopyContext(Display *dpy, GLXContext src, GLXContext dst, GLuint mask)
+void glXCopyContext(Display *dpy, GLXContext src, GLXContext dst,
+                    unsigned long mask)
 {
    struct _glxapi_table *t = get_dispatch(dpy);
    if (!t)

diff --git a/src/mesa/drivers/x11/glxapi.h b/src/mesa/drivers/x11/glxapi.h
index 33105f43d880385a372df1089dd4ce9f04a69727..c9a8f93816401fa5aed2214bfd12df9b3ea1da23 100644 (file)
--- a/src/mesa/drivers/x11/glxapi.h
+++ b/src/mesa/drivers/x11/glxapi.h
@@ -1,4 +1,4 @@
-/* $Id: glxapi.h,v 1.1 1999/11/28 20:07:19 brianp Exp $ */
+/* $Id: glxapi.h,v 1.2 2000/02/23 23:09:12 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -56,7 +56,7 @@
 struct _glxapi_table {
    /* GLX 1.0 functions */
    XVisualInfo *(*ChooseVisual)(Display *dpy, int screen, int *list);
-   void (*CopyContext)(Display *dpy, GLXContext src, GLXContext dst, GLuint mask);
+   void (*CopyContext)(Display *dpy, GLXContext src, GLXContext dst, unsigned long mask);
    GLXContext (*CreateContext)(Display *dpy, XVisualInfo *visinfo, GLXContext shareList, Bool direct);
    GLXPixmap (*CreateGLXPixmap)(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap);
    void (*DestroyContext)(Display *dpy, GLXContext ctx);