From 180bad84774493d48f2793a6281d825560944863 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Tue, 2 Dec 2008 02:50:45 -0200 Subject: [PATCH] Add visibility flags to XSERVER_CFLAGS. This is done to actually change DIX_CFLAGS, as not all "modules" use XORG_CFLAGS. Also export the symbols that are required by other modules after the change. --- Xext/xace.c | 2 +- configure.ac | 1 + fb/fbbits.h | 14 +++++++------- fb/fbglyph.c | 2 +- glx/glxscreens.c | 2 +- hw/xfree86/loader/dixsym.c | 2 +- hw/xfree86/os-support/hurd/hurd_video.c | 2 +- miext/shadow/shrotpack.h | 2 +- os/utils.c | 2 +- xfixes/region.c | 2 +- xfixes/xfixes.c | 2 +- 11 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Xext/xace.c b/Xext/xace.c index 8a8f8c61d..495613117 100644 --- a/Xext/xace.c +++ b/Xext/xace.c @@ -80,7 +80,7 @@ void XaceHookAuditEnd(ClientPtr ptr, int result) /* Entry point for hook functions. Called by Xserver. */ -int XaceHook(int hook, ...) +_X_EXPORT int XaceHook(int hook, ...) { pointer calldata; /* data passed to callback */ int *prv = NULL; /* points to return value from callback */ diff --git a/configure.ac b/configure.ac index 989d0ab08..13da45e8c 100644 --- a/configure.ac +++ b/configure.ac @@ -1266,6 +1266,7 @@ if test "x$XORG" = xyes; then if test x$have_visibility != xno; then symbol_visibility=$VISIBILITY_CFLAGS XORG_CFLAGS="$XORG_CFLAGS $VISIBILITY_CFLAGS" + XSERVER_CFLAGS="$XSERVER_CFLAGS $VISIBILITY_CFLAGS" fi fi dnl added to xorg-server.pc diff --git a/fb/fbbits.h b/fb/fbbits.h index 44991f106..8733be836 100644 --- a/fb/fbbits.h +++ b/fb/fbbits.h @@ -67,7 +67,7 @@ */ #ifdef BRESSOLID -void +_X_EXPORT void BRESSOLID (DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -123,7 +123,7 @@ BRESSOLID (DrawablePtr pDrawable, #endif #ifdef BRESDASH -void +_X_EXPORT void BRESDASH (DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -269,7 +269,7 @@ onOffOdd: #endif #ifdef DOTS -void +_X_EXPORT void DOTS (FbBits *dst, FbStride dstStride, int dstBpp, @@ -329,7 +329,7 @@ DOTS (FbBits *dst, #define ARCCOPY(d) STORE(d,xorBits) #define ARCRROP(d) RROP(d,andBits,xorBits) -void +_X_EXPORT void ARC (FbBits *dst, FbStride dstStride, int dstBpp, @@ -557,7 +557,7 @@ ARC (FbBits *dst, # define WRITE4(d,n,fg) (WRITE2(d,n,fg), WRITE2(d,(n)+2,fg)) #endif -void +_X_EXPORT void GLYPH (FbBits *dstBits, FbStride dstStride, int dstBpp, @@ -659,7 +659,7 @@ GLYPH (FbBits *dstBits, #endif #ifdef POLYLINE -void +_X_EXPORT void POLYLINE (DrawablePtr pDrawable, GCPtr pGC, int mode, @@ -797,7 +797,7 @@ POLYLINE (DrawablePtr pDrawable, #endif #ifdef POLYSEGMENT -void +_X_EXPORT void POLYSEGMENT (DrawablePtr pDrawable, GCPtr pGC, int nseg, diff --git a/fb/fbglyph.c b/fb/fbglyph.c index 3f2ec75b3..9ea907dc7 100644 --- a/fb/fbglyph.c +++ b/fb/fbglyph.c @@ -129,7 +129,7 @@ fbGlyphIn (RegionPtr pRegion, #define CASE(a,b,c,d) (a | (b << 1) | (c << 2) | (d << 3)) #endif -void +_X_EXPORT void fbGlyph24 (FbBits *dstBits, FbStride dstStride, int dstBpp, diff --git a/glx/glxscreens.c b/glx/glxscreens.c index 0c76cfdab..988a59d65 100644 --- a/glx/glxscreens.c +++ b/glx/glxscreens.c @@ -223,7 +223,7 @@ glxGetScreen(ScreenPtr pScreen) return dixLookupPrivate(&pScreen->devPrivates, glxScreenPrivateKey); } -void GlxSetVisualConfigs(int nconfigs, +_X_EXPORT void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs, void **privates) { /* We keep this stub around for the DDX drivers that still diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 19b93c5f0..ee05f584b 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -370,7 +370,7 @@ _X_HIDDEN void *dixLookupTab[] = { SYMVAR(noXFixesExtension) #endif #ifdef XKB -/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */ +/* noXkbExtension is defined in xkb/xkbInit.c */ SYMVAR(noXkbExtension) #endif #ifdef PANORAMIX diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c index b0953775d..87f5e90cb 100644 --- a/hw/xfree86/os-support/hurd/hurd_video.c +++ b/hw/xfree86/os-support/hurd/hurd_video.c @@ -95,7 +95,7 @@ xf86MapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size) return (pointer)addr; } -void +_X_EXPORT void xf86UnMapVidMem(int ScreenNum,pointer Base,unsigned long Size) { kern_return_t err = vm_deallocate(mach_task_self(), (int)Base, Size); diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h index 015a98595..f49b174dd 100644 --- a/miext/shadow/shrotpack.h +++ b/miext/shadow/shrotpack.h @@ -93,7 +93,7 @@ #endif -void +_X_EXPORT void FUNC (ScreenPtr pScreen, shadowBufPtr pBuf) { diff --git a/os/utils.c b/os/utils.c index 54fb1209c..6d2a9e9ab 100644 --- a/os/utils.c +++ b/os/utils.c @@ -175,7 +175,7 @@ _X_EXPORT Bool noXFree86VidModeExtension = FALSE; #ifdef XFIXES _X_EXPORT Bool noXFixesExtension = FALSE; #endif -/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */ +/* noXkbExtension is defined in xkb/xkbInit.c */ #ifdef PANORAMIX /* Xinerama is disabled by default unless enabled via +xinerama */ _X_EXPORT Bool noPanoramiXExtension = TRUE; diff --git a/xfixes/region.c b/xfixes/region.c index cac24b5da..ae4805894 100644 --- a/xfixes/region.c +++ b/xfixes/region.c @@ -34,7 +34,7 @@ extern int RenderErrBase; #include #include -RESTYPE RegionResType; +_X_EXPORT RESTYPE RegionResType; static int RegionResFree (pointer data, XID id) diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c index d1225c6f3..aadbc0d10 100644 --- a/xfixes/xfixes.c +++ b/xfixes/xfixes.c @@ -55,7 +55,7 @@ static unsigned char XFixesReqCode; int XFixesEventBase; -int XFixesErrorBase; +_X_EXPORT int XFixesErrorBase; static int XFixesClientPrivateKeyIndex; static DevPrivateKey XFixesClientPrivateKey = &XFixesClientPrivateKeyIndex;