diff options
| author | Stefan Dirsch <sndirsch@suse.de> | 2018-07-17 12:40:00 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2018-07-18 11:05:24 -0600 |
| commit | b060a0782f09ebe4f60c8fd4564c11ba043c331f (patch) | |
| tree | 8636715c6dcb426f22100ad16a8f01f3e3846de8 | |
| parent | c4f7cdfd9d877ac6e476b3063b8248be40a86dee (diff) | |
GLAPI doesn't have an 'extern' in some circumstances. This way,
variable declarations become definitions (fdo #100916).
Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
Reviewed-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | GLwDrawA.h | 10 | ||||
| -rw-r--r-- | GLwDrawAP.h | 4 |
2 files changed, 10 insertions, 4 deletions
@@ -131,12 +131,18 @@ #define GLwNaccumAlphaSize "accumAlphaSize" #define GLwCAccumAlphaSize "AccumAlphaSize" +#if (defined(__GNUC__) && __GNUC__ >= 4) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) +# define GLAPIVAR extern __attribute__((visibility("default"))) +#else +# define GLAPIVAR extern +#endif + #ifdef __GLX_MOTIF typedef struct _GLwMDrawingAreaClassRec *GLwMDrawingAreaWidgetClass; typedef struct _GLwMDrawingAreaRec *GLwMDrawingAreaWidget; -GLAPI WidgetClass glwMDrawingAreaWidgetClass; +GLAPIVAR WidgetClass glwMDrawingAreaWidgetClass; #else @@ -144,7 +150,7 @@ GLAPI WidgetClass glwMDrawingAreaWidgetClass; typedef struct _GLwDrawingAreaClassRec *GLwDrawingAreaWidgetClass; typedef struct _GLwDrawingAreaRec *GLwDrawingAreaWidget; -GLAPI WidgetClass glwDrawingAreaWidgetClass; +GLAPIVAR WidgetClass glwDrawingAreaWidgetClass; #endif diff --git a/GLwDrawAP.h b/GLwDrawAP.h index 4ff21b4..6d29849 100644 --- a/GLwDrawAP.h +++ b/GLwDrawAP.h @@ -59,7 +59,7 @@ typedef struct _GLwMDrawingAreaClassRec { } GLwMDrawingAreaClassRec; -GLAPI GLwMDrawingAreaClassRec glwMDrawingAreaClassRec; +GLAPIVAR GLwMDrawingAreaClassRec glwMDrawingAreaClassRec; /* XT */ @@ -70,7 +70,7 @@ typedef struct _GLwDrawingAreaClassRec { GLwDrawingAreaClassPart glwDrawingArea_class; } GLwDrawingAreaClassRec; -GLAPI GLwDrawingAreaClassRec glwDrawingAreaClassRec; +GLAPIVAR GLwDrawingAreaClassRec glwDrawingAreaClassRec; #endif |