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.
This commit is contained in:
Paulo Cesar Pereira de Andrade 2008-12-02 02:50:45 -02:00
parent 8c560422b4
commit 180bad8477
11 changed files with 17 additions and 16 deletions

View File

@ -80,7 +80,7 @@ void XaceHookAuditEnd(ClientPtr ptr, int result)
/* Entry point for hook functions. Called by Xserver. /* Entry point for hook functions. Called by Xserver.
*/ */
int XaceHook(int hook, ...) _X_EXPORT int XaceHook(int hook, ...)
{ {
pointer calldata; /* data passed to callback */ pointer calldata; /* data passed to callback */
int *prv = NULL; /* points to return value from callback */ int *prv = NULL; /* points to return value from callback */

View File

@ -1266,6 +1266,7 @@ if test "x$XORG" = xyes; then
if test x$have_visibility != xno; then if test x$have_visibility != xno; then
symbol_visibility=$VISIBILITY_CFLAGS symbol_visibility=$VISIBILITY_CFLAGS
XORG_CFLAGS="$XORG_CFLAGS $VISIBILITY_CFLAGS" XORG_CFLAGS="$XORG_CFLAGS $VISIBILITY_CFLAGS"
XSERVER_CFLAGS="$XSERVER_CFLAGS $VISIBILITY_CFLAGS"
fi fi
fi fi
dnl added to xorg-server.pc dnl added to xorg-server.pc

View File

@ -67,7 +67,7 @@
*/ */
#ifdef BRESSOLID #ifdef BRESSOLID
void _X_EXPORT void
BRESSOLID (DrawablePtr pDrawable, BRESSOLID (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -123,7 +123,7 @@ BRESSOLID (DrawablePtr pDrawable,
#endif #endif
#ifdef BRESDASH #ifdef BRESDASH
void _X_EXPORT void
BRESDASH (DrawablePtr pDrawable, BRESDASH (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -269,7 +269,7 @@ onOffOdd:
#endif #endif
#ifdef DOTS #ifdef DOTS
void _X_EXPORT void
DOTS (FbBits *dst, DOTS (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -329,7 +329,7 @@ DOTS (FbBits *dst,
#define ARCCOPY(d) STORE(d,xorBits) #define ARCCOPY(d) STORE(d,xorBits)
#define ARCRROP(d) RROP(d,andBits,xorBits) #define ARCRROP(d) RROP(d,andBits,xorBits)
void _X_EXPORT void
ARC (FbBits *dst, ARC (FbBits *dst,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -557,7 +557,7 @@ ARC (FbBits *dst,
# define WRITE4(d,n,fg) (WRITE2(d,n,fg), WRITE2(d,(n)+2,fg)) # define WRITE4(d,n,fg) (WRITE2(d,n,fg), WRITE2(d,(n)+2,fg))
#endif #endif
void _X_EXPORT void
GLYPH (FbBits *dstBits, GLYPH (FbBits *dstBits,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,
@ -659,7 +659,7 @@ GLYPH (FbBits *dstBits,
#endif #endif
#ifdef POLYLINE #ifdef POLYLINE
void _X_EXPORT void
POLYLINE (DrawablePtr pDrawable, POLYLINE (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int mode, int mode,
@ -797,7 +797,7 @@ POLYLINE (DrawablePtr pDrawable,
#endif #endif
#ifdef POLYSEGMENT #ifdef POLYSEGMENT
void _X_EXPORT void
POLYSEGMENT (DrawablePtr pDrawable, POLYSEGMENT (DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int nseg, int nseg,

View File

@ -129,7 +129,7 @@ fbGlyphIn (RegionPtr pRegion,
#define CASE(a,b,c,d) (a | (b << 1) | (c << 2) | (d << 3)) #define CASE(a,b,c,d) (a | (b << 1) | (c << 2) | (d << 3))
#endif #endif
void _X_EXPORT void
fbGlyph24 (FbBits *dstBits, fbGlyph24 (FbBits *dstBits,
FbStride dstStride, FbStride dstStride,
int dstBpp, int dstBpp,

View File

@ -223,7 +223,7 @@ glxGetScreen(ScreenPtr pScreen)
return dixLookupPrivate(&pScreen->devPrivates, glxScreenPrivateKey); return dixLookupPrivate(&pScreen->devPrivates, glxScreenPrivateKey);
} }
void GlxSetVisualConfigs(int nconfigs, _X_EXPORT void GlxSetVisualConfigs(int nconfigs,
__GLXvisualConfig *configs, void **privates) __GLXvisualConfig *configs, void **privates)
{ {
/* We keep this stub around for the DDX drivers that still /* We keep this stub around for the DDX drivers that still

View File

@ -370,7 +370,7 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMVAR(noXFixesExtension) SYMVAR(noXFixesExtension)
#endif #endif
#ifdef XKB #ifdef XKB
/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */ /* noXkbExtension is defined in xkb/xkbInit.c */
SYMVAR(noXkbExtension) SYMVAR(noXkbExtension)
#endif #endif
#ifdef PANORAMIX #ifdef PANORAMIX

View File

@ -95,7 +95,7 @@ xf86MapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size)
return (pointer)addr; return (pointer)addr;
} }
void _X_EXPORT void
xf86UnMapVidMem(int ScreenNum,pointer Base,unsigned long Size) xf86UnMapVidMem(int ScreenNum,pointer Base,unsigned long Size)
{ {
kern_return_t err = vm_deallocate(mach_task_self(), (int)Base, Size); kern_return_t err = vm_deallocate(mach_task_self(), (int)Base, Size);

View File

@ -93,7 +93,7 @@
#endif #endif
void _X_EXPORT void
FUNC (ScreenPtr pScreen, FUNC (ScreenPtr pScreen,
shadowBufPtr pBuf) shadowBufPtr pBuf)
{ {

View File

@ -175,7 +175,7 @@ _X_EXPORT Bool noXFree86VidModeExtension = FALSE;
#ifdef XFIXES #ifdef XFIXES
_X_EXPORT Bool noXFixesExtension = FALSE; _X_EXPORT Bool noXFixesExtension = FALSE;
#endif #endif
/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */ /* noXkbExtension is defined in xkb/xkbInit.c */
#ifdef PANORAMIX #ifdef PANORAMIX
/* Xinerama is disabled by default unless enabled via +xinerama */ /* Xinerama is disabled by default unless enabled via +xinerama */
_X_EXPORT Bool noPanoramiXExtension = TRUE; _X_EXPORT Bool noPanoramiXExtension = TRUE;

View File

@ -34,7 +34,7 @@ extern int RenderErrBase;
#include <gcstruct.h> #include <gcstruct.h>
#include <window.h> #include <window.h>
RESTYPE RegionResType; _X_EXPORT RESTYPE RegionResType;
static int static int
RegionResFree (pointer data, XID id) RegionResFree (pointer data, XID id)

View File

@ -55,7 +55,7 @@
static unsigned char XFixesReqCode; static unsigned char XFixesReqCode;
int XFixesEventBase; int XFixesEventBase;
int XFixesErrorBase; _X_EXPORT int XFixesErrorBase;
static int XFixesClientPrivateKeyIndex; static int XFixesClientPrivateKeyIndex;
static DevPrivateKey XFixesClientPrivateKey = &XFixesClientPrivateKeyIndex; static DevPrivateKey XFixesClientPrivateKey = &XFixesClientPrivateKeyIndex;