From 111e4f27d852dcc5a53f4f82a42d401f74866232 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Thu, 16 Jun 2011 16:32:42 -0700 Subject: [PATCH] glw: Mark all extern symbols GLAPI to regain default visibility (#31294) Since switching to hidden visibility on gcc, GLw apps were failing to link. Use the GLAPI definition to use default visibility where necessary. $ nm lib/libGLw.so | grep DrawingArea 0000000000004020 T GLwCreateMDrawingArea 0000000000003430 T GLwDrawingAreaMakeCurrent 0000000000003410 T GLwDrawingAreaSwapBuffers 0000000000204c60 D glwDrawingAreaClassRec 0000000000204d48 D glwDrawingAreaWidgetClass 00000000002053c0 D glwMDrawingAreaClassRec 00000000002054e0 D glwMDrawingAreaWidgetClass Signed-off-by: Dan Nicholson --- src/glw/GLwDrawA.h | 8 ++++---- src/glw/GLwDrawAP.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/glw/GLwDrawA.h b/src/glw/GLwDrawA.h index cd631b4..b9711c2 100644 --- a/src/glw/GLwDrawA.h +++ b/src/glw/GLwDrawA.h @@ -136,7 +136,7 @@ typedef struct _GLwMDrawingAreaClassRec *GLwMDrawingAreaWidgetClass; typedef struct _GLwMDrawingAreaRec *GLwMDrawingAreaWidget; -extern WidgetClass glwMDrawingAreaWidgetClass; +GLAPI WidgetClass glwMDrawingAreaWidgetClass; #else @@ -144,7 +144,7 @@ extern WidgetClass glwMDrawingAreaWidgetClass; typedef struct _GLwDrawingAreaClassRec *GLwDrawingAreaWidgetClass; typedef struct _GLwDrawingAreaRec *GLwDrawingAreaWidget; -extern WidgetClass glwDrawingAreaWidgetClass; +GLAPI WidgetClass glwDrawingAreaWidgetClass; #endif @@ -177,8 +177,8 @@ extern "C" { #endif /* front ends to glXMakeCurrent and glXSwapBuffers */ -extern void GLwDrawingAreaMakeCurrent(Widget w,GLXContext ctx); -extern void GLwDrawingAreaSwapBuffers(Widget w); +GLAPI void GLwDrawingAreaMakeCurrent(Widget w,GLXContext ctx); +GLAPI void GLwDrawingAreaSwapBuffers(Widget w); #ifdef __GLX_MOTIF #ifdef _NO_PROTO diff --git a/src/glw/GLwDrawAP.h b/src/glw/GLwDrawAP.h index f121701..4ff21b4 100644 --- a/src/glw/GLwDrawAP.h +++ b/src/glw/GLwDrawAP.h @@ -59,7 +59,7 @@ typedef struct _GLwMDrawingAreaClassRec { } GLwMDrawingAreaClassRec; -extern GLwMDrawingAreaClassRec glwMDrawingAreaClassRec; +GLAPI GLwMDrawingAreaClassRec glwMDrawingAreaClassRec; /* XT */ @@ -70,7 +70,7 @@ typedef struct _GLwDrawingAreaClassRec { GLwDrawingAreaClassPart glwDrawingArea_class; } GLwDrawingAreaClassRec; -extern GLwDrawingAreaClassRec glwDrawingAreaClassRec; +GLAPI GLwDrawingAreaClassRec glwDrawingAreaClassRec; #endif -- 1.7.3.4