X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=inline;f=src%2Fmesa%2Fmain%2Fattrib.h;h=f4fd4929f733fc4ee7bedfa74713cdc18cec143e;hb=bc5be5323f14c4f790ecaf29991158be1f5435b0;hp=2cf8fe693453a12414cb468f85be3714c966d3ab;hpb=145d762044f795bf9d68f28079cc5e5d3056920e;p=mesa.git

diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h
index 2cf8fe69345..f4fd4929f73 100644
--- a/src/mesa/main/attrib.h
+++ b/src/mesa/main/attrib.h
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
  *
  * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
@@ -17,19 +16,20 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #ifndef ATTRIB_H
 #define ATTRIB_H
 
 
-#include "mtypes.h"
+#include "glheader.h"
 
-
-#if _HAVE_FULL_GL
+struct _glapi_table;
+struct gl_context;
 
 extern void GLAPIENTRY
 _mesa_PushAttrib( GLbitfield mask );
@@ -44,17 +44,9 @@ extern void GLAPIENTRY
 _mesa_PopClientAttrib( void );
 
 extern void 
-_mesa_init_attrib( GLcontext *ctx );
+_mesa_init_attrib( struct gl_context *ctx );
 
 extern void 
-_mesa_free_attrib_data( GLcontext *ctx );
-
-#else
-
-/** No-op */
-#define _mesa_init_attrib( c ) ((void)0)
-#define _mesa_free_attrib_data( c ) ((void)0)
-
-#endif
+_mesa_free_attrib_data( struct gl_context *ctx );
 
-#endif
+#endif /* ATTRIB_H */