|
 |
ca31e5 |
From b060a0782f09ebe4f60c8fd4564c11ba043c331f Mon Sep 17 00:00:00 2001
|
|
|
ca31e5 |
From: Stefan Dirsch <sndirsch@suse.de>
|
|
|
ca31e5 |
Date: Tue, 17 Jul 2018 12:40:00 -0600
|
|
|
ca31e5 |
Subject: [PATCH] libGLw: Use newly introduced GLAPIVAR for variables
|
|
|
ca31e5 |
|
|
|
ca31e5 |
GLAPI doesn't have an 'extern' in some circumstances. This way,
|
|
|
ca31e5 |
variable declarations become definitions (fdo #100916).
|
|
|
ca31e5 |
|
|
|
ca31e5 |
Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
|
|
|
ca31e5 |
Reviewed-by: Brian Paul <brianp@vmware.com>
|
|
|
ca31e5 |
---
|
|
|
ca31e5 |
GLwDrawA.h | 10 ++++++++--
|
|
|
ca31e5 |
GLwDrawAP.h | 4 ++--
|
|
|
ca31e5 |
2 files changed, 10 insertions(+), 4 deletions(-)
|
|
|
ca31e5 |
|
|
|
ca31e5 |
diff --git a/GLwDrawA.h b/GLwDrawA.h
|
|
|
ca31e5 |
index b9711c2..316a70d 100644
|
|
|
ca31e5 |
--- a/GLwDrawA.h
|
|
|
ca31e5 |
+++ b/GLwDrawA.h
|
|
|
ca31e5 |
@@ -131,12 +131,18 @@
|
|
|
ca31e5 |
#define GLwNaccumAlphaSize "accumAlphaSize"
|
|
|
ca31e5 |
#define GLwCAccumAlphaSize "AccumAlphaSize"
|
|
|
ca31e5 |
|
|
|
ca31e5 |
+#if (defined(__GNUC__) && __GNUC__ >= 4) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
|
|
|
ca31e5 |
+# define GLAPIVAR extern __attribute__((visibility("default")))
|
|
|
ca31e5 |
+#else
|
|
|
ca31e5 |
+# define GLAPIVAR extern
|
|
|
ca31e5 |
+#endif
|
|
|
ca31e5 |
+
|
|
|
ca31e5 |
#ifdef __GLX_MOTIF
|
|
|
ca31e5 |
|
|
|
ca31e5 |
typedef struct _GLwMDrawingAreaClassRec *GLwMDrawingAreaWidgetClass;
|
|
|
ca31e5 |
typedef struct _GLwMDrawingAreaRec *GLwMDrawingAreaWidget;
|
|
|
ca31e5 |
|
|
|
ca31e5 |
-GLAPI WidgetClass glwMDrawingAreaWidgetClass;
|
|
|
ca31e5 |
+GLAPIVAR WidgetClass glwMDrawingAreaWidgetClass;
|
|
|
ca31e5 |
|
|
|
ca31e5 |
|
|
|
ca31e5 |
#else
|
|
|
ca31e5 |
@@ -144,7 +150,7 @@ GLAPI WidgetClass glwMDrawingAreaWidgetClass;
|
|
|
ca31e5 |
typedef struct _GLwDrawingAreaClassRec *GLwDrawingAreaWidgetClass;
|
|
|
ca31e5 |
typedef struct _GLwDrawingAreaRec *GLwDrawingAreaWidget;
|
|
|
ca31e5 |
|
|
|
ca31e5 |
-GLAPI WidgetClass glwDrawingAreaWidgetClass;
|
|
|
ca31e5 |
+GLAPIVAR WidgetClass glwDrawingAreaWidgetClass;
|
|
|
ca31e5 |
|
|
|
ca31e5 |
|
|
|
ca31e5 |
#endif
|
|
|
ca31e5 |
diff --git a/GLwDrawAP.h b/GLwDrawAP.h
|
|
|
ca31e5 |
index 4ff21b4..6d29849 100644
|
|
|
ca31e5 |
--- a/GLwDrawAP.h
|
|
|
ca31e5 |
+++ b/GLwDrawAP.h
|
|
|
ca31e5 |
@@ -59,7 +59,7 @@ typedef struct _GLwMDrawingAreaClassRec {
|
|
|
ca31e5 |
} GLwMDrawingAreaClassRec;
|
|
|
ca31e5 |
|
|
|
ca31e5 |
|
|
|
ca31e5 |
-GLAPI GLwMDrawingAreaClassRec glwMDrawingAreaClassRec;
|
|
|
ca31e5 |
+GLAPIVAR GLwMDrawingAreaClassRec glwMDrawingAreaClassRec;
|
|
|
ca31e5 |
|
|
|
ca31e5 |
|
|
|
ca31e5 |
/* XT */
|
|
|
ca31e5 |
@@ -70,7 +70,7 @@ typedef struct _GLwDrawingAreaClassRec {
|
|
|
ca31e5 |
GLwDrawingAreaClassPart glwDrawingArea_class;
|
|
|
ca31e5 |
} GLwDrawingAreaClassRec;
|
|
|
ca31e5 |
|
|
|
ca31e5 |
-GLAPI GLwDrawingAreaClassRec glwDrawingAreaClassRec;
|
|
|
ca31e5 |
+GLAPIVAR GLwDrawingAreaClassRec glwDrawingAreaClassRec;
|
|
|
ca31e5 |
|
|
|
ca31e5 |
|
|
|
ca31e5 |
#endif
|
|
|
ca31e5 |
--
|
|
|
ca31e5 |
2.21.0
|
|
|
ca31e5 |
|