X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fenums.h;h=0e18cd407e9dbd955f82b9d4a4361b8d86a3c235;hb=78a391ed8311fc5215347f8775bf0aa29568b78d;hp=7e8d4ee94fc30690f181bdf4848ab98b75fee9f8;hpb=38b317d508a2a3a4cc6d700ebca80c3b06c913e2;p=mesa.git

diff --git a/src/mesa/main/enums.h b/src/mesa/main/enums.h
index 7e8d4ee94fc..0e18cd407e9 100644
--- a/src/mesa/main/enums.h
+++ b/src/mesa/main/enums.h
@@ -10,9 +10,8 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  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"),
@@ -27,29 +26,33 @@
  * 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.
  */
-/* $XFree86: xc/extras/Mesa/src/mesa/main/enums.h,v 1.2 2004/06/23 19:40:14 tsi Exp $ */
+
 
 #ifndef _ENUMS_H_
 #define _ENUMS_H_
 
 
-#if defined(_HAVE_FULL_GL) && _HAVE_FULL_GL
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-extern const char *_mesa_lookup_enum_by_nr( int nr );
-extern int _mesa_lookup_enum_by_name( const char *symbol );
 
-#else
+extern const char *_mesa_enum_to_string( int nr );
 
-/** No-op */
-#define _mesa_lookup_enum_by_name( s ) 0
+/* Get the name of an enum given that it is a primitive type.  Avoids
+ * GL_FALSE/GL_POINTS ambiguity and others.
+ */
+const char *_mesa_lookup_prim_by_nr( unsigned nr );
 
-/** No-op */
-#define _mesa_lookup_enum_by_nr( n ) "unknown"
 
+#ifdef __cplusplus
+}
 #endif
 
+
 #endif