Merge commit 'origin/master' into gallium-0.2

[mesa.git] / include / GL / glfbdev.h

diff --git a/include/GL/glfbdev.h b/include/GL/glfbdev.h
index cd6cdd5e51fc479a0ae4308b5801fb45a82d471f..4e25e7b0566c70e1ddef0830f2c6d2a49c5f5013 100644 (file)
--- a/include/GL/glfbdev.h
+++ b/include/GL/glfbdev.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.5
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2005  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"),
@@ -49,6 +49,7 @@ typedef struct GLFBDevContextRec *GLFBDevContextPtr;
 #define GLFBDEV_STENCIL_SIZE    103
 #define GLFBDEV_ACCUM_SIZE      104
 #define GLFBDEV_LEVEL           105
+#define GLFBDEV_MULTISAMPLE     106
 #define GLFBDEV_NONE              0
 
 /* For glFBDevGetString */
@@ -62,7 +63,10 @@ extern const char *
 glFBDevGetString( int str );
 
 
-extern const void *
+typedef void (*GLFBDevProc)();
+
+
+extern GLFBDevProc
 glFBDevGetProcAddress( const char *procName );