svga: always link with C++

[mesa.git] / src / mesa / main / attrib.h

diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h
index 82676246373feefc7cbf2bbbd355297b9c269241..1ecf3a591f2884ddd5f7c0cd98b891441727c068 100644 (file)
--- a/src/mesa/main/attrib.h
+++ b/src/mesa/main/attrib.h
@@ -1,18 +1,8 @@
-/**
- * \file attrib.h
- * Attribute stacks.
- * 
- * \if subset
- * (No-op)
- *
- * \endif
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  7.1
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  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"),
@@ -32,37 +22,33 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
-
 #ifndef ATTRIB_H
 #define ATTRIB_H
 
 
-#include "mtypes.h"
+#include "compiler.h"
+#include "glheader.h"
+#include "mfeatures.h"
 
+struct _glapi_table;
+struct gl_context;
 
-#if _HAVE_FULL_GL
-
-extern void
+extern void GLAPIENTRY
 _mesa_PushAttrib( GLbitfield mask );
 
-extern void
+extern void GLAPIENTRY
 _mesa_PopAttrib( void );
 
-extern void
+extern void GLAPIENTRY
 _mesa_PushClientAttrib( GLbitfield mask );
 
-extern void
+extern void GLAPIENTRY
 _mesa_PopClientAttrib( void );
 
 extern void 
-_mesa_init_attrib( GLcontext *ctx );
-
-#else
+_mesa_init_attrib( struct gl_context *ctx );
 
-/** No-op */
-#define _mesa_init_attrib( c ) ((void)0)
-
-#endif
+extern void 
+_mesa_free_attrib_data( struct gl_context *ctx );
 
-#endif
+#endif /* ATTRIB_H */