summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'third_party')
-rw-r--r--third_party/mesa/MesaLib/include/GL/osmesa.h16
-rw-r--r--third_party/mesa/README.chromium5
2 files changed, 15 insertions, 6 deletions
diff --git a/third_party/mesa/MesaLib/include/GL/osmesa.h b/third_party/mesa/MesaLib/include/GL/osmesa.h
index 56fa23c..2327c79 100644
--- a/third_party/mesa/MesaLib/include/GL/osmesa.h
+++ b/third_party/mesa/MesaLib/include/GL/osmesa.h
@@ -101,9 +101,11 @@ extern "C" {
typedef struct osmesa_context *OSMesaContext;
-#if defined(__BEOS__) || defined(__QUICKDRAW__)
-#pragma export on
-#endif
+// Disabled this because __QUICKDRAW__ is defined on Mac and gcc does not
+// support the pragma.
+//#if defined(__BEOS__) || defined(__QUICKDRAW__)
+//#pragma export on
+//#endif
/*
@@ -276,9 +278,11 @@ GLAPI void GLAPIENTRY
OSMesaColorClamp(GLboolean enable);
-#if defined(__BEOS__) || defined(__QUICKDRAW__)
-#pragma export off
-#endif
+// Disabled this because __QUICKDRAW__ is defined on Mac and gcc does not
+// support the pragma.
+//#if defined(__BEOS__) || defined(__QUICKDRAW__)
+//#pragma export off
+//#endif
#ifdef __cplusplus
diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium
index 15efc64..050ad03 100644
--- a/third_party/mesa/README.chromium
+++ b/third_party/mesa/README.chromium
@@ -30,3 +30,8 @@ Later modifications:
#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
# define PRAGMA_EXPORT_SUPPORTED 1
#endif
+
+- Commented out this in osmesa.h:
+#if defined(__BEOS__) || defined(__QUICKDRAW__)
+#pragma export on
+#endif