#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
-extern "C" {
#include "glxclient.h"
#include "glx_error.h"
#include "dri2.h"
-#include "dri_interface.h"
+#include "GL/internal/dri_interface.h"
#include "dri2_priv.h"
-}
-struct attribute_test_vector {
- const char *glx_string;
- const char *dri_string;
- int glx_attribute;
- int dri_attribute;
-};
+namespace {
+ struct attribute_test_vector {
+ const char *glx_string;
+ const char *dri_string;
+ int glx_attribute;
+ int dri_attribute;
+ };
+}
#define E(g, d) { # g, # d, g, d }
return -1;
}
-struct __DRI2rendererQueryExtensionRec rendererQueryExt = {
+static const __DRI2rendererQueryExtension rendererQueryExt = {
{ __DRI2_RENDERER_QUERY, 1 },
fake_queryInteger,