mesa: always return GL_OUT_OF_MEMORY or GL_NO_ERROR when KHR_no_error enabled

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

diff --git a/src/mesa/main/extensions.h b/src/mesa/main/extensions.h
index e4671be2cf68822330ac667c5149eecde2484450..efef1be47518f774498913fb0c2347168e3181b3 100644 (file)
--- a/src/mesa/main/extensions.h
+++ b/src/mesa/main/extensions.h
@@ -38,6 +38,10 @@
 
 #include "glheader.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct gl_context;
 struct gl_extensions;
 
@@ -75,7 +79,9 @@ struct mesa_extension {
    /** Year the extension was proposed or approved.  Used to sort the 
     * extension string chronologically. */
    uint16_t year;
-} extern const _mesa_extension_table[];
+};
+
+extern const struct mesa_extension _mesa_extension_table[];
 
 
 /* Generate enums for the functions below */
@@ -83,10 +89,11 @@ enum {
 #define EXT(name_str, ...) MESA_EXTENSION_##name_str,
 #include "extensions_table.h"
 #undef EXT
+MESA_EXTENSION_COUNT
 };
 
 
-/** Checks if the context suports a user-facing extension */
+/** Checks if the context supports a user-facing extension */
 #define EXT(name_str, driver_cap, ...) \
 static inline bool \
 _mesa_has_##name_str(const struct gl_context *ctx) \
@@ -100,4 +107,8 @@ _mesa_has_##name_str(const struct gl_context *ctx) \
 extern struct gl_extensions _mesa_extension_override_enables;
 extern struct gl_extensions _mesa_extension_override_disables;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif