[PATCH 22/31] DIX: _X_UNEXPORT
Peter Hutterer
peter.hutterer at who-t.net
Tue Dec 6 14:59:44 PST 2011
On Fri, Dec 02, 2011 at 11:31:28AM +0000, Daniel Stone wrote:
> Remove _X_EXPORT tags from functions not used by any drivers.
>
> Signed-off-by: Daniel Stone <daniel at fooishbar.org>
Needed:
- QueueWorkProc
Cheers,
Peter
> ---
> dix/dispatch.c | 2 +-
> include/callback.h | 4 +-
> include/dix.h | 54 +++++++++++++++++-----------------
> include/dixevents.h | 4 +-
> include/dixfont.h | 46 +++++++++++++++---------------
> include/dixstruct.h | 2 +-
> include/extension.h | 8 ++--
> include/extnsionst.h | 6 ++--
> include/gc.h | 10 +++---
> include/globals.h | 76 +++++++++++++++++++++++++-------------------------
> include/misc.h | 2 +-
> include/opaque.h | 50 ++++++++++++++++----------------
> include/os.h | 2 +-
> include/pixmap.h | 4 +-
> include/privates.h | 2 +-
> include/property.h | 2 +-
> include/regionstr.h | 2 +-
> include/registry.h | 14 ++++----
> include/resource.h | 16 +++++-----
> include/screenint.h | 2 +-
> include/scrnintstr.h | 2 +-
> include/selection.h | 12 ++++----
> include/swaprep.h | 72 +++++++++++++++++++++++-----------------------
> include/swapreq.h | 2 +-
> 24 files changed, 198 insertions(+), 198 deletions(-)
>
> diff --git a/dix/dispatch.c b/dix/dispatch.c
> index 51b9033..bbf48db 100644
> --- a/dix/dispatch.c
> +++ b/dix/dispatch.c
> @@ -167,7 +167,7 @@ static int nextFreeClientID; /* always MIN free client ID */
>
> static int nClients; /* number of authorized clients */
>
> -CallbackListPtr ClientStateCallback;
> +_X_EXPORT CallbackListPtr ClientStateCallback;
>
> /* dispatchException & isItTimeToYield must be declared volatile since they
> * are modified by signal handlers - otherwise optimizer may assume it doesn't
> diff --git a/include/callback.h b/include/callback.h
> index 9a1da73..0543cfc 100644
> --- a/include/callback.h
> +++ b/include/callback.h
> @@ -75,7 +75,7 @@ extern _X_EXPORT Bool DeleteCallback(
> CallbackProcPtr /*callback*/,
> pointer /*data*/);
>
> -extern _X_EXPORT void _CallCallbacks(
> +extern void _CallCallbacks(
> CallbackListPtr * /*pcbl*/,
> pointer /*call_data*/);
>
> @@ -89,6 +89,6 @@ CallCallbacks(CallbackListPtr *pcbl, pointer call_data)
> extern _X_EXPORT void DeleteCallbackList(
> CallbackListPtr * /*pcbl*/);
>
> -extern _X_EXPORT void InitCallbackManager(void);
> +extern void InitCallbackManager(void);
>
> #endif /* CALLBACK_H */
> diff --git a/include/dix.h b/include/dix.h
> index ab70596..35509b3 100644
> --- a/include/dix.h
> +++ b/include/dix.h
> @@ -126,12 +126,12 @@ typedef struct _WorkQueue *WorkQueuePtr;
> extern _X_EXPORT ClientPtr clients[MAXCLIENTS];
> extern _X_EXPORT ClientPtr serverClient;
> extern _X_EXPORT int currentMaxClients;
> -extern _X_EXPORT char dispatchExceptionAtReset;
> +extern char dispatchExceptionAtReset;
>
> typedef int HWEventQueueType;
> typedef HWEventQueueType* HWEventQueuePtr;
>
> -extern _X_EXPORT HWEventQueuePtr checkForInput[2];
> +extern HWEventQueuePtr checkForInput[2];
>
> typedef struct _TimeStamp {
> CARD32 months; /* really ~49.7 days */
> @@ -151,16 +151,16 @@ extern _X_EXPORT void UpdateCurrentTime(void);
>
> extern _X_EXPORT void UpdateCurrentTimeIf(void);
>
> -extern _X_EXPORT int dixDestroyPixmap(
> +extern int dixDestroyPixmap(
> pointer /*value*/,
> XID /*pid*/);
>
> -extern _X_EXPORT void InitClient(
> +extern void InitClient(
> ClientPtr /*client*/,
> int /*i*/,
> pointer /*ospriv*/);
>
> -extern _X_EXPORT ClientPtr NextAvailableClient(
> +extern ClientPtr NextAvailableClient(
> pointer /*ospriv*/);
>
> extern _X_EXPORT void SendErrorToClient(
> @@ -170,13 +170,13 @@ extern _X_EXPORT void SendErrorToClient(
> XID /*resId*/,
> int /*errorCode*/);
>
> -extern _X_EXPORT void MarkClientException(
> +extern void MarkClientException(
> ClientPtr /*client*/);
>
> extern _X_HIDDEN Bool CreateConnectionBlock(void);
> /* dixutils.c */
>
> -extern _X_EXPORT int CompareISOLatin1Lowered(
> +extern int CompareISOLatin1Lowered(
> unsigned char * /*a*/,
> int alen,
> unsigned char * /*b*/,
> @@ -215,21 +215,21 @@ extern _X_EXPORT int dixLookupClient(
>
> extern _X_EXPORT void NoopDDA(void);
>
> -extern _X_EXPORT int AlterSaveSetForClient(
> +extern int AlterSaveSetForClient(
> ClientPtr /*client*/,
> WindowPtr /*pWin*/,
> unsigned /*mode*/,
> Bool /*toRoot*/,
> Bool /*map*/);
>
> -extern _X_EXPORT void DeleteWindowFromAnySaveSet(
> +extern void DeleteWindowFromAnySaveSet(
> WindowPtr /*pWin*/);
>
> -extern _X_EXPORT void BlockHandler(
> +extern void BlockHandler(
> pointer /*pTimeout*/,
> pointer /*pReadmask*/);
>
> -extern _X_EXPORT void WakeupHandler(
> +extern void WakeupHandler(
> int /*result*/,
> pointer /*pReadmask*/);
>
> @@ -254,13 +254,13 @@ extern _X_EXPORT void RemoveBlockAndWakeupHandlers(
> WakeupHandlerProcPtr /*wakeupHandler*/,
> pointer /*blockData*/);
>
> -extern _X_EXPORT void InitBlockAndWakeupHandlers(void);
> +extern void InitBlockAndWakeupHandlers(void);
>
> -extern _X_EXPORT void ProcessWorkQueue(void);
> +extern void ProcessWorkQueue(void);
>
> -extern _X_EXPORT void ProcessWorkQueueZombies(void);
> +extern void ProcessWorkQueueZombies(void);
>
> -extern _X_EXPORT Bool QueueWorkProc(
> +extern Bool QueueWorkProc(
> Bool (* /*function*/)(
> ClientPtr /*clientUnused*/,
> pointer /*closure*/),
> @@ -302,17 +302,17 @@ extern _X_EXPORT Bool ValidAtom(
> extern _X_EXPORT const char *NameForAtom(
> Atom /*atom*/);
>
> -extern _X_EXPORT void AtomError(void) _X_NORETURN;
> +extern void AtomError(void) _X_NORETURN;
>
> -extern _X_EXPORT void FreeAllAtoms(void);
> +extern void FreeAllAtoms(void);
>
> -extern _X_EXPORT void InitAtoms(void);
> +extern void InitAtoms(void);
>
> /* main.c */
>
> -extern _X_EXPORT void SetVendorRelease(int release);
> +extern void SetVendorRelease(int release);
>
> -extern _X_EXPORT void SetVendorString(char *string);
> +extern void SetVendorString(char *string);
>
> /* events.c */
>
> @@ -434,7 +434,7 @@ extern void FixKeyState(
> extern void RecalculateDeliverableEvents(
> WindowPtr /* pWin */);
>
> -extern _X_EXPORT int OtherClientGone(
> +extern int OtherClientGone(
> pointer /* value */,
> XID /* id */);
>
> @@ -505,7 +505,7 @@ extern _X_EXPORT int TryClientEvents(
> Mask /*filter*/,
> GrabPtr /*grab*/);
>
> -extern _X_EXPORT void WindowsRestructured(void);
> +extern void WindowsRestructured(void);
>
> extern int SetClientPointer(
> ClientPtr /* client */,
> @@ -523,11 +523,11 @@ extern Bool IsInterferingGrab(
> xEvent* /* events */);
>
> #ifdef PANORAMIX
> -extern _X_EXPORT void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff);
> +extern void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff);
> #endif
>
> #ifdef RANDR
> -extern _X_EXPORT void
> +extern void
> ScreenRestructured (ScreenPtr pScreen);
> #endif
>
> @@ -538,7 +538,7 @@ extern _X_EXPORT int ffs(int i);
> * ServerGrabCallback stuff
> */
>
> -extern _X_EXPORT CallbackListPtr ServerGrabCallback;
> +extern CallbackListPtr ServerGrabCallback;
>
> typedef enum {SERVER_GRABBED, SERVER_UNGRABBED,
> CLIENT_PERVIOUS, CLIENT_IMPERVIOUS } ServerGrabState;
> @@ -552,7 +552,7 @@ typedef struct {
> * EventCallback stuff
> */
>
> -extern _X_EXPORT CallbackListPtr EventCallback;
> +extern CallbackListPtr EventCallback;
>
> typedef struct {
> ClientPtr client;
> @@ -564,7 +564,7 @@ typedef struct {
> * DeviceEventCallback stuff
> */
>
> -extern _X_EXPORT CallbackListPtr DeviceEventCallback;
> +extern CallbackListPtr DeviceEventCallback;
>
> typedef struct {
> InternalEvent *event;
> diff --git a/include/dixevents.h b/include/dixevents.h
> index ac007fb..17dac96 100644
> --- a/include/dixevents.h
> +++ b/include/dixevents.h
> @@ -41,12 +41,12 @@ extern int MaybeDeliverEventsToClient(
>
> extern int ProcWarpPointer(ClientPtr /* client */);
>
> -extern _X_EXPORT int EventSelectForWindow(
> +extern int EventSelectForWindow(
> WindowPtr /* pWin */,
> ClientPtr /* client */,
> Mask /* mask */);
>
> -extern _X_EXPORT int EventSuppressForWindow(
> +extern int EventSuppressForWindow(
> WindowPtr /* pWin */,
> ClientPtr /* client */,
> Mask /* mask */,
> diff --git a/include/dixfont.h b/include/dixfont.h
> index 617b94a..eb9bfa3 100644
> --- a/include/dixfont.h
> +++ b/include/dixfont.h
> @@ -33,45 +33,45 @@ SOFTWARE.
>
> typedef struct _DIXFontProp *DIXFontPropPtr;
>
> -extern _X_EXPORT Bool SetDefaultFont(char * /*defaultfontname*/);
> +extern Bool SetDefaultFont(char * /*defaultfontname*/);
>
> -extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe*/);
> +extern void QueueFontWakeup(FontPathElementPtr /*fpe*/);
>
> -extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe*/);
> +extern void RemoveFontWakeup(FontPathElementPtr /*fpe*/);
>
> -extern _X_EXPORT void FontWakeup(pointer /*data*/,
> +extern void FontWakeup(pointer /*data*/,
> int /*count*/,
> pointer /*LastSelectMask*/);
>
> -extern _X_EXPORT int OpenFont(ClientPtr /*client*/,
> +extern int OpenFont(ClientPtr /*client*/,
> XID /*fid*/,
> Mask /*flags*/,
> unsigned /*lenfname*/,
> char * /*pfontname*/);
>
> -extern _X_EXPORT int CloseFont(pointer /*pfont*/,
> +extern int CloseFont(pointer /*pfont*/,
> XID /*fid*/);
>
> typedef struct _xQueryFontReply *xQueryFontReplyPtr;
>
> -extern _X_EXPORT void QueryFont(FontPtr /*pFont*/,
> +extern void QueryFont(FontPtr /*pFont*/,
> xQueryFontReplyPtr /*pReply*/,
> int /*nProtoCCIStructs*/);
>
> -extern _X_EXPORT int ListFonts(ClientPtr /*client*/,
> +extern int ListFonts(ClientPtr /*client*/,
> unsigned char * /*pattern*/,
> unsigned int /*length*/,
> unsigned int /*max_names*/);
>
> -extern _X_EXPORT int
> +extern int
> doListFontsWithInfo(ClientPtr /*client*/,
> LFWIclosurePtr /*c*/);
>
> -extern _X_EXPORT int doPolyText(ClientPtr /*client*/,
> +extern int doPolyText(ClientPtr /*client*/,
> PTclosurePtr /*c*/
> );
>
> -extern _X_EXPORT int PolyText(ClientPtr /*client*/,
> +extern int PolyText(ClientPtr /*client*/,
> DrawablePtr /*pDraw*/,
> GCPtr /*pGC*/,
> unsigned char * /*pElt*/,
> @@ -81,10 +81,10 @@ extern _X_EXPORT int PolyText(ClientPtr /*client*/,
> int /*reqType*/,
> XID /*did*/);
>
> -extern _X_EXPORT int doImageText(ClientPtr /*client*/,
> +extern int doImageText(ClientPtr /*client*/,
> ITclosurePtr /*c*/);
>
> -extern _X_EXPORT int ImageText(ClientPtr /*client*/,
> +extern int ImageText(ClientPtr /*client*/,
> DrawablePtr /*pDraw*/,
> GCPtr /*pGC*/,
> int /*nChars*/,
> @@ -94,29 +94,29 @@ extern _X_EXPORT int ImageText(ClientPtr /*client*/,
> int /*reqType*/,
> XID /*did*/);
>
> -extern _X_EXPORT int SetFontPath(ClientPtr /*client*/,
> +extern int SetFontPath(ClientPtr /*client*/,
> int /*npaths*/,
> unsigned char * /*paths*/);
>
> -extern _X_EXPORT int SetDefaultFontPath(char * /*path*/);
> +extern int SetDefaultFontPath(char * /*path*/);
>
> -extern _X_EXPORT int GetFontPath(ClientPtr client,
> +extern int GetFontPath(ClientPtr client,
> int *count,
> int *length,
> unsigned char **result);
>
> -extern _X_EXPORT void DeleteClientFontStuff(ClientPtr /*client*/);
> +extern void DeleteClientFontStuff(ClientPtr /*client*/);
>
> /* Quartz support on Mac OS X pulls in the QuickDraw
> framework whose InitFonts function conflicts here. */
> #ifdef __APPLE__
> #define InitFonts Darwin_X_InitFonts
> #endif
> -extern _X_EXPORT void InitFonts(void);
> +extern void InitFonts(void);
>
> -extern _X_EXPORT void FreeFonts(void);
> +extern void FreeFonts(void);
>
> -extern _X_EXPORT FontPtr find_old_font(XID /*id*/);
> +extern FontPtr find_old_font(XID /*id*/);
>
> extern _X_EXPORT void GetGlyphs(FontPtr /*font*/,
> unsigned long /*count*/,
> @@ -135,11 +135,11 @@ extern _X_EXPORT Bool QueryTextExtents(FontPtr /*pFont*/,
> unsigned char * /*chars*/,
> ExtentInfoPtr /*info*/);
>
> -extern _X_EXPORT Bool ParseGlyphCachingMode(char * /*str*/);
> +extern Bool ParseGlyphCachingMode(char * /*str*/);
>
> -extern _X_EXPORT void InitGlyphCaching(void);
> +extern void InitGlyphCaching(void);
>
> -extern _X_EXPORT void SetGlyphCachingMode(int /*newmode*/);
> +extern void SetGlyphCachingMode(int /*newmode*/);
>
> extern _X_EXPORT void register_fpe_functions(void);
>
> diff --git a/include/dixstruct.h b/include/dixstruct.h
> index 1a4aece..f072096 100644
> --- a/include/dixstruct.h
> +++ b/include/dixstruct.h
> @@ -155,7 +155,7 @@ typedef struct _WorkQueue {
> } WorkQueueRec;
>
> extern _X_EXPORT TimeStamp currentTime;
> -extern _X_EXPORT TimeStamp lastDeviceEventTime;
> +extern TimeStamp lastDeviceEventTime;
>
> extern _X_EXPORT int CompareTimeStamps(
> TimeStamp /*a*/,
> diff --git a/include/extension.h b/include/extension.h
> index 21f243a..52cf679 100644
> --- a/include/extension.h
> +++ b/include/extension.h
> @@ -89,13 +89,13 @@ typedef struct {
>
> extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/);
>
> -extern _X_EXPORT Bool EnableDisableExtension(const char *name, Bool enable);
> +extern Bool EnableDisableExtension(const char *name, Bool enable);
>
> -extern _X_EXPORT void EnableDisableExtensionError(const char *name, Bool enable);
> +extern void EnableDisableExtensionError(const char *name, Bool enable);
>
> -extern _X_EXPORT void InitExtensions(int argc, char **argv);
> +extern void InitExtensions(int argc, char **argv);
>
> -extern _X_EXPORT void CloseDownExtensions(void);
> +extern void CloseDownExtensions(void);
>
> extern _X_EXPORT void LoadExtension(ExtensionModule *ext, Bool external);
>
> diff --git a/include/extnsionst.h b/include/extnsionst.h
> index 0902928..9f1206a 100644
> --- a/include/extnsionst.h
> +++ b/include/extnsionst.h
> @@ -81,7 +81,7 @@ typedef struct _ExtensionEntry {
> */
> typedef void (*EventSwapPtr) (xEvent *, xEvent *);
>
> -extern _X_EXPORT EventSwapPtr EventSwapVector[128];
> +extern EventSwapPtr EventSwapVector[128];
>
> extern _X_EXPORT void NotImplemented ( /* FIXME: this may move to another file... */
> xEvent *,
> @@ -107,8 +107,8 @@ extern _X_EXPORT Bool AddExtensionAlias(
> const char* /*alias*/,
> ExtensionEntry * /*extension*/);
>
> -extern _X_EXPORT ExtensionEntry *CheckExtension(const char *extname);
> -extern _X_EXPORT ExtensionEntry *GetExtensionEntry(int major);
> +extern ExtensionEntry *CheckExtension(const char *extname);
> +extern ExtensionEntry *GetExtensionEntry(int major);
>
> #endif /* EXTENSIONSTRUCT_H */
>
> diff --git a/include/gc.h b/include/gc.h
> index 2079cfa..e3cb758 100644
> --- a/include/gc.h
> +++ b/include/gc.h
> @@ -128,24 +128,24 @@ extern _X_EXPORT void FreeGCperDepth(
> extern _X_EXPORT Bool CreateGCperDepth(
> int /*screenNum*/);
>
> -extern _X_EXPORT Bool CreateDefaultStipple(
> +extern Bool CreateDefaultStipple(
> int /*screenNum*/);
>
> -extern _X_EXPORT void FreeDefaultStipple(
> +extern void FreeDefaultStipple(
> int /*screenNum*/);
>
> -extern _X_EXPORT int SetDashes(
> +extern int SetDashes(
> GCPtr /*pGC*/,
> unsigned /*offset*/,
> unsigned /*ndash*/,
> unsigned char* /*pdash*/);
>
> -extern _X_EXPORT int VerifyRectOrder(
> +extern int VerifyRectOrder(
> int /*nrects*/,
> xRectangle* /*prects*/,
> int /*ordering*/);
>
> -extern _X_EXPORT int SetClipRects(
> +extern int SetClipRects(
> GCPtr /*pGC*/,
> int /*xOrigin*/,
> int /*yOrigin*/,
> diff --git a/include/globals.h b/include/globals.h
> index 17bca82..bcbe154 100644
> --- a/include/globals.h
> +++ b/include/globals.h
> @@ -6,52 +6,52 @@
>
> /* Global X server variables that are visible to mi, dix, os, and ddx */
>
> -extern _X_EXPORT CARD32 defaultScreenSaverTime;
> -extern _X_EXPORT CARD32 defaultScreenSaverInterval;
> -extern _X_EXPORT CARD32 ScreenSaverTime;
> -extern _X_EXPORT CARD32 ScreenSaverInterval;
> +extern CARD32 defaultScreenSaverTime;
> +extern CARD32 defaultScreenSaverInterval;
> +extern CARD32 ScreenSaverTime;
> +extern CARD32 ScreenSaverInterval;
>
> #ifdef SCREENSAVER
> -extern _X_EXPORT Bool screenSaverSuspended;
> +extern Bool screenSaverSuspended;
> #endif
>
> -extern _X_EXPORT char *defaultFontPath;
> +extern char *defaultFontPath;
> extern _X_EXPORT int monitorResolution;
> -extern _X_EXPORT int defaultColorVisualClass;
> +extern int defaultColorVisualClass;
>
> -extern _X_EXPORT int GrabInProgress;
> -extern _X_EXPORT Bool noTestExtensions;
> -extern _X_EXPORT char *SeatId;
> -extern _X_EXPORT char *ConnectionInfo;
> +extern int GrabInProgress;
> +extern Bool noTestExtensions;
> +extern char *SeatId;
> +extern char *ConnectionInfo;
>
> #ifdef DPMSExtension
> extern _X_EXPORT CARD32 DPMSStandbyTime;
> -extern _X_EXPORT CARD32 DPMSSuspendTime;
> -extern _X_EXPORT CARD32 DPMSOffTime;
> -extern _X_EXPORT CARD16 DPMSPowerLevel;
> -extern _X_EXPORT Bool DPMSEnabled;
> -extern _X_EXPORT Bool DPMSDisabledSwitch;
> -extern _X_EXPORT Bool DPMSCapableFlag;
> +extern CARD32 DPMSSuspendTime;
> +extern CARD32 DPMSOffTime;
> +extern CARD16 DPMSPowerLevel;
> +extern Bool DPMSEnabled;
> +extern Bool DPMSDisabledSwitch;
> +extern Bool DPMSCapableFlag;
> #endif
>
> #ifdef PANORAMIX
> -extern _X_EXPORT Bool PanoramiXExtensionDisabledHack;
> +extern Bool PanoramiXExtensionDisabledHack;
> #endif
>
> #ifdef COMPOSITE
> -extern _X_EXPORT Bool noCompositeExtension;
> +extern Bool noCompositeExtension;
> #endif
>
> #ifdef DAMAGE
> -extern _X_EXPORT Bool noDamageExtension;
> +extern Bool noDamageExtension;
> #endif
>
> #ifdef DBE
> -extern _X_EXPORT Bool noDbeExtension;
> +extern Bool noDbeExtension;
> #endif
>
> #ifdef DPMSExtension
> -extern _X_EXPORT Bool noDPMSExtension;
> +extern Bool noDPMSExtension;
> #endif
>
> #ifdef GLXEXT
> @@ -59,67 +59,67 @@ extern _X_EXPORT Bool noGlxExtension;
> #endif
>
> #ifdef SCREENSAVER
> -extern _X_EXPORT Bool noScreenSaverExtension;
> +extern Bool noScreenSaverExtension;
> #endif
>
> #ifdef MITSHM
> -extern _X_EXPORT Bool noMITShmExtension;
> +extern Bool noMITShmExtension;
> #endif
>
> #ifdef RANDR
> -extern _X_EXPORT Bool noRRExtension;
> +extern Bool noRRExtension;
> #endif
>
> -extern _X_EXPORT Bool noRenderExtension;
> +extern Bool noRenderExtension;
>
> #ifdef XCSECURITY
> -extern _X_EXPORT Bool noSecurityExtension;
> +extern Bool noSecurityExtension;
> #endif
>
> #ifdef RES
> -extern _X_EXPORT Bool noResExtension;
> +extern Bool noResExtension;
> #endif
>
> #ifdef XF86BIGFONT
> -extern _X_EXPORT Bool noXFree86BigfontExtension;
> +extern Bool noXFree86BigfontExtension;
> #endif
>
> #ifdef XFreeXDGA
> -extern _X_EXPORT Bool noXFree86DGAExtension;
> +extern Bool noXFree86DGAExtension;
> #endif
>
> #ifdef XF86DRI
> -extern _X_EXPORT Bool noXFree86DRIExtension;
> +extern Bool noXFree86DRIExtension;
> #endif
>
> #ifdef XF86VIDMODE
> -extern _X_EXPORT Bool noXFree86VidModeExtension;
> +extern Bool noXFree86VidModeExtension;
> #endif
>
> #ifdef XFIXES
> -extern _X_EXPORT Bool noXFixesExtension;
> +extern Bool noXFixesExtension;
> #endif
>
> #ifdef PANORAMIX
> -extern _X_EXPORT Bool noPanoramiXExtension;
> +extern Bool noPanoramiXExtension;
> #endif
>
> #ifdef XSELINUX
> -extern _X_EXPORT Bool noSELinuxExtension;
> +extern Bool noSELinuxExtension;
>
> #define SELINUX_MODE_DEFAULT 0
> #define SELINUX_MODE_DISABLED 1
> #define SELINUX_MODE_PERMISSIVE 2
> #define SELINUX_MODE_ENFORCING 3
> -extern _X_EXPORT int selinuxEnforcingState;
> +extern int selinuxEnforcingState;
> #endif
>
> #ifdef XV
> -extern _X_EXPORT Bool noXvExtension;
> +extern Bool noXvExtension;
> #endif
>
> #ifdef DRI2
> -extern _X_EXPORT Bool noDRI2Extension;
> +extern Bool noDRI2Extension;
> #endif
>
> #endif /* !_XSERV_GLOBAL_H_ */
> diff --git a/include/misc.h b/include/misc.h
> index ef86fa5..94993bf 100644
> --- a/include/misc.h
> +++ b/include/misc.h
> @@ -335,7 +335,7 @@ extern _X_EXPORT void SwapShorts(
> short *list,
> unsigned long count);
>
> -extern _X_EXPORT void MakePredeclaredAtoms(void);
> +extern void MakePredeclaredAtoms(void);
>
> extern _X_EXPORT int Ones(
> unsigned long /*mask*/);
> diff --git a/include/opaque.h b/include/opaque.h
> index 5c70717..3331869 100644
> --- a/include/opaque.h
> +++ b/include/opaque.h
> @@ -33,45 +33,45 @@ from The Open Group.
>
> #include "globals.h"
>
> -extern _X_EXPORT char *defaultTextFont;
> -extern _X_EXPORT char *defaultCursorFont;
> +extern char *defaultTextFont;
> +extern char *defaultCursorFont;
> extern _X_EXPORT int MaxClients;
> -extern _X_EXPORT volatile char isItTimeToYield;
> -extern _X_EXPORT volatile char dispatchException;
> +extern volatile char isItTimeToYield;
> +extern volatile char dispatchException;
>
> /* bit values for dispatchException */
> #define DE_RESET 1
> #define DE_TERMINATE 2
> #define DE_PRIORITYCHANGE 4 /* set when a client's priority changes */
>
> -extern _X_EXPORT CARD32 TimeOutValue;
> -extern _X_EXPORT int ScreenSaverBlanking;
> -extern _X_EXPORT int ScreenSaverAllowExposures;
> -extern _X_EXPORT int defaultScreenSaverBlanking;
> -extern _X_EXPORT int defaultScreenSaverAllowExposures;
> -extern _X_EXPORT char *display;
> -
> -extern _X_EXPORT int defaultBackingStore;
> -extern _X_EXPORT Bool disableBackingStore;
> -extern _X_EXPORT Bool enableBackingStore;
> -extern _X_EXPORT Bool PartialNetwork;
> -extern _X_EXPORT Bool RunFromSigStopParent;
> +extern CARD32 TimeOutValue;
> +extern int ScreenSaverBlanking;
> +extern int ScreenSaverAllowExposures;
> +extern int defaultScreenSaverBlanking;
> +extern int defaultScreenSaverAllowExposures;
> +extern char *display;
> +
> +extern int defaultBackingStore;
> +extern Bool disableBackingStore;
> +extern Bool enableBackingStore;
> +extern Bool PartialNetwork;
> +extern Bool RunFromSigStopParent;
> #ifdef RLIMIT_DATA
> -extern _X_EXPORT int limitDataSpace;
> +extern int limitDataSpace;
> #endif
> #ifdef RLIMIT_STACK
> -extern _X_EXPORT int limitStackSpace;
> +extern int limitStackSpace;
> #endif
> #ifdef RLIMIT_NOFILE
> -extern _X_EXPORT int limitNoFile;
> +extern int limitNoFile;
> #endif
> -extern _X_EXPORT Bool defeatAccessControl;
> -extern _X_EXPORT long maxBigRequestSize;
> -extern _X_EXPORT Bool party_like_its_1989;
> -extern _X_EXPORT Bool whiteRoot;
> -extern _X_EXPORT Bool bgNoneRoot;
> +extern Bool defeatAccessControl;
> +extern long maxBigRequestSize;
> +extern Bool party_like_its_1989;
> +extern Bool whiteRoot;
> +extern Bool bgNoneRoot;
>
> -extern _X_EXPORT Bool CoreDump;
> +extern Bool CoreDump;
>
>
> #endif /* OPAQUE_H */
> diff --git a/include/os.h b/include/os.h
> index 379a48e..d170946 100644
> --- a/include/os.h
> +++ b/include/os.h
> @@ -179,7 +179,7 @@ typedef CARD32 (*OsTimerCallback)(
> CARD32 /* time */,
> pointer /* arg */);
>
> -extern _X_EXPORT void TimerInit(void);
> +extern void TimerInit(void);
>
> extern _X_EXPORT Bool TimerForce(OsTimerPtr /* timer */);
>
> diff --git a/include/pixmap.h b/include/pixmap.h
> index 014a111..6c94abe 100644
> --- a/include/pixmap.h
> +++ b/include/pixmap.h
> @@ -103,10 +103,10 @@ extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(
> extern _X_EXPORT void FreeScratchPixmapHeader(
> PixmapPtr /*pPixmap*/);
>
> -extern _X_EXPORT Bool CreateScratchPixmapsForScreen(
> +extern Bool CreateScratchPixmapsForScreen(
> int /*scrnum*/);
>
> -extern _X_EXPORT void FreeScratchPixmapsForScreen(
> +extern void FreeScratchPixmapsForScreen(
> int /*scrnum*/);
>
> extern _X_EXPORT PixmapPtr AllocatePixmap(
> diff --git a/include/privates.h b/include/privates.h
> index 2b0040c..1844bfc 100644
> --- a/include/privates.h
> +++ b/include/privates.h
> @@ -275,7 +275,7 @@ dixPrivateUsage(void);
> * Resets the privates subsystem. dixResetPrivates is called from the main loop
> * before each server generation. This function must only be called by main().
> */
> -extern _X_EXPORT void
> +extern void
> dixResetPrivates(void);
>
> /*
> diff --git a/include/property.h b/include/property.h
> index 075eb4a..531815d 100644
> --- a/include/property.h
> +++ b/include/property.h
> @@ -85,7 +85,7 @@ extern _X_EXPORT int DeleteProperty(
> WindowPtr /*pWin*/,
> Atom /*propName*/);
>
> -extern _X_EXPORT void DeleteAllWindowProperties(
> +extern void DeleteAllWindowProperties(
> WindowPtr /*pWin*/);
>
> #endif /* PROPERTY_H */
> diff --git a/include/regionstr.h b/include/regionstr.h
> index 3dfef5c..a46ef03 100644
> --- a/include/regionstr.h
> +++ b/include/regionstr.h
> @@ -179,7 +179,7 @@ static inline void RegionNull(RegionPtr _pReg)
> (_pReg)->data = &RegionEmptyData;
> }
>
> -extern _X_EXPORT void InitRegions(void);
> +extern void InitRegions(void);
>
> extern _X_EXPORT RegionPtr RegionCreate(
> BoxPtr /*rect*/,
> diff --git a/include/registry.h b/include/registry.h
> index 325f765..8b77d49 100644
> --- a/include/registry.h
> +++ b/include/registry.h
> @@ -29,21 +29,21 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
> * not be a stack variable.
> */
> extern _X_EXPORT void RegisterResourceName(RESTYPE type, char *name);
> -extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry *ext);
> +extern void RegisterExtensionNames(ExtensionEntry *ext);
>
> /*
> * Lookup functions. The returned string must not be modified or freed.
> */
> -extern _X_EXPORT const char *LookupMajorName(int major);
> -extern _X_EXPORT const char *LookupRequestName(int major, int minor);
> -extern _X_EXPORT const char *LookupEventName(int event);
> -extern _X_EXPORT const char *LookupErrorName(int error);
> -extern _X_EXPORT const char *LookupResourceName(RESTYPE rtype);
> +extern const char *LookupMajorName(int major);
> +extern const char *LookupRequestName(int major, int minor);
> +extern const char *LookupEventName(int event);
> +extern const char *LookupErrorName(int error);
> +extern const char *LookupResourceName(RESTYPE rtype);
>
> /*
> * Setup and teardown
> */
> -extern _X_EXPORT void dixResetRegistry(void);
> +extern void dixResetRegistry(void);
>
> #else /* XREGISTRY */
>
> diff --git a/include/resource.h b/include/resource.h
> index 772b7b8..20bc8c2 100644
> --- a/include/resource.h
> +++ b/include/resource.h
> @@ -124,7 +124,7 @@ typedef uint32_t RESTYPE;
> #define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
>
> /* Resource state callback */
> -extern _X_EXPORT CallbackListPtr ResourceStateCallback;
> +extern CallbackListPtr ResourceStateCallback;
>
> typedef enum {ResourceStateAdding,
> ResourceStateFreeing} ResourceState;
> @@ -164,7 +164,7 @@ extern _X_EXPORT void SetResourceTypeErrorValue(
>
> extern _X_EXPORT RESTYPE CreateNewResourceClass(void);
>
> -extern _X_EXPORT Bool InitClientResources(
> +extern Bool InitClientResources(
> ClientPtr /*client*/);
>
> extern _X_EXPORT XID FakeClientID(
> @@ -208,10 +208,10 @@ extern _X_EXPORT void FindAllClientResources(
> extern _X_EXPORT void FreeClientNeverRetainResources(
> ClientPtr /*client*/);
>
> -extern _X_EXPORT void FreeClientResources(
> +extern void FreeClientResources(
> ClientPtr /*client*/);
>
> -extern _X_EXPORT void FreeAllResources(void);
> +extern void FreeAllResources(void);
>
> extern _X_EXPORT Bool LegalNewID(
> XID /*id*/,
> @@ -237,19 +237,19 @@ extern _X_EXPORT int dixLookupResourceByClass(
> ClientPtr client,
> Mask access_mode);
>
> -extern _X_EXPORT void GetXIDRange(
> +extern void GetXIDRange(
> int /*client*/,
> Bool /*server*/,
> XID * /*minp*/,
> XID * /*maxp*/);
>
> -extern _X_EXPORT unsigned int GetXIDList(
> +extern unsigned int GetXIDList(
> ClientPtr /*client*/,
> unsigned int /*count*/,
> XID * /*pids*/);
>
> -extern _X_EXPORT RESTYPE lastResourceType;
> -extern _X_EXPORT RESTYPE TypeMask;
> +extern RESTYPE lastResourceType;
> +extern RESTYPE TypeMask;
>
> #endif /* RESOURCE_H */
>
> diff --git a/include/screenint.h b/include/screenint.h
> index 4e6c574..6d074a3 100644
> --- a/include/screenint.h
> +++ b/include/screenint.h
> @@ -55,7 +55,7 @@ typedef struct _Visual *VisualPtr;
> typedef struct _Depth *DepthPtr;
> typedef struct _Screen *ScreenPtr;
>
> -extern _X_EXPORT int AddScreen(
> +extern int AddScreen(
> Bool (* /*pfnInit*/)(
> int /*index*/,
> ScreenPtr /*pScreen*/,
> diff --git a/include/scrnintstr.h b/include/scrnintstr.h
> index 132a671..5656c2b 100644
> --- a/include/scrnintstr.h
> +++ b/include/scrnintstr.h
> @@ -569,7 +569,7 @@ typedef struct _ScreenInfo {
>
> extern _X_EXPORT ScreenInfo screenInfo;
>
> -extern _X_EXPORT void InitOutput(
> +extern void InitOutput(
> ScreenInfo * /*pScreenInfo*/,
> int /*argc*/,
> char ** /*argv*/);
> diff --git a/include/selection.h b/include/selection.h
> index 3271f6a..5b0db97 100644
> --- a/include/selection.h
> +++ b/include/selection.h
> @@ -70,12 +70,12 @@ typedef struct _Selection {
> * Selection API
> */
>
> -extern _X_EXPORT int dixLookupSelection(Selection **result, Atom name,
> +extern int dixLookupSelection(Selection **result, Atom name,
> ClientPtr client, Mask access_mode);
>
> -extern _X_EXPORT Selection *CurrentSelections;
> +extern Selection *CurrentSelections;
>
> -extern _X_EXPORT CallbackListPtr SelectionCallback;
> +extern CallbackListPtr SelectionCallback;
>
> typedef enum {
> SelectionSetOwner,
> @@ -94,11 +94,11 @@ typedef struct {
> * Selection server internals
> */
>
> -extern _X_EXPORT void InitSelections(void);
> +extern void InitSelections(void);
>
> -extern _X_EXPORT void DeleteWindowFromAnySelections(WindowPtr pWin);
> +extern void DeleteWindowFromAnySelections(WindowPtr pWin);
>
> -extern _X_EXPORT void DeleteClientFromAnySelections(ClientPtr client);
> +extern void DeleteClientFromAnySelections(ClientPtr client);
>
> #endif /* SELECTION_H */
>
> diff --git a/include/swaprep.h b/include/swaprep.h
> index 848c164..26ae717 100644
> --- a/include/swaprep.h
> +++ b/include/swaprep.h
> @@ -41,47 +41,47 @@ extern _X_EXPORT void CopySwap16Write(
> int /* size */,
> short * /* pbuf */);
>
> -extern _X_EXPORT void SGenericReply(
> +extern void SGenericReply(
> ClientPtr /* pClient */,
> int /* size */,
> xGenericReply * /* pRep */);
>
> -extern _X_EXPORT void SGetWindowAttributesReply(
> +extern void SGetWindowAttributesReply(
> ClientPtr /* pClient */,
> int /* size */,
> xGetWindowAttributesReply * /* pRep */);
>
> -extern _X_EXPORT void SGetGeometryReply(
> +extern void SGetGeometryReply(
> ClientPtr /* pClient */,
> int /* size */,
> xGetGeometryReply * /* pRep */);
>
> -extern _X_EXPORT void SQueryTreeReply(
> +extern void SQueryTreeReply(
> ClientPtr /* pClient */,
> int /* size */,
> xQueryTreeReply * /* pRep */);
>
> -extern _X_EXPORT void SInternAtomReply(
> +extern void SInternAtomReply(
> ClientPtr /* pClient */,
> int /* size */,
> xInternAtomReply * /* pRep */);
>
> -extern _X_EXPORT void SGetAtomNameReply(
> +extern void SGetAtomNameReply(
> ClientPtr /* pClient */,
> int /* size */,
> xGetAtomNameReply * /* pRep */);
>
> -extern _X_EXPORT void SGetPropertyReply(
> +extern void SGetPropertyReply(
> ClientPtr /* pClient */,
> int /* size */,
> xGetPropertyReply * /* pRep */);
>
> -extern _X_EXPORT void SListPropertiesReply(
> +extern void SListPropertiesReply(
> ClientPtr /* pClient */,
> int /* size */,
> xListPropertiesReply * /* pRep */);
>
> -extern _X_EXPORT void SGetSelectionOwnerReply(
> +extern void SGetSelectionOwnerReply(
> ClientPtr /* pClient */,
> int /* size */,
> xGetSelectionOwnerReply * /* pRep */);
> @@ -91,7 +91,7 @@ extern void SQueryPointerReply(
> int /* size */,
> xQueryPointerReply * /* pRep */);
>
> -extern _X_EXPORT void SwapTimeCoordWrite(
> +extern void SwapTimeCoordWrite(
> ClientPtr /* pClient */,
> int /* size */,
> xTimecoord * /* pRep */);
> @@ -101,7 +101,7 @@ extern void SGetMotionEventsReply(
> int /* size */,
> xGetMotionEventsReply * /* pRep */);
>
> -extern _X_EXPORT void STranslateCoordsReply(
> +extern void STranslateCoordsReply(
> ClientPtr /* pClient */,
> int /* size */,
> xTranslateCoordsReply * /* pRep */);
> @@ -116,82 +116,82 @@ extern void SQueryKeymapReply(
> int /* size */,
> xQueryKeymapReply * /* pRep */);
>
> -extern _X_EXPORT void SQueryFontReply(
> +extern void SQueryFontReply(
> ClientPtr /* pClient */,
> int /* size */,
> xQueryFontReply * /* pRep */);
>
> -extern _X_EXPORT void SQueryTextExtentsReply(
> +extern void SQueryTextExtentsReply(
> ClientPtr /* pClient */,
> int /* size */,
> xQueryTextExtentsReply * /* pRep */);
>
> -extern _X_EXPORT void SListFontsReply(
> +extern void SListFontsReply(
> ClientPtr /* pClient */,
> int /* size */,
> xListFontsReply * /* pRep */);
>
> -extern _X_EXPORT void SListFontsWithInfoReply(
> +extern void SListFontsWithInfoReply(
> ClientPtr /* pClient */,
> int /* size */,
> xListFontsWithInfoReply * /* pRep */);
>
> -extern _X_EXPORT void SGetFontPathReply(
> +extern void SGetFontPathReply(
> ClientPtr /* pClient */,
> int /* size */,
> xGetFontPathReply * /* pRep */);
>
> -extern _X_EXPORT void SGetImageReply(
> +extern void SGetImageReply(
> ClientPtr /* pClient */,
> int /* size */,
> xGetImageReply * /* pRep */);
>
> -extern _X_EXPORT void SListInstalledColormapsReply(
> +extern void SListInstalledColormapsReply(
> ClientPtr /* pClient */,
> int /* size */,
> xListInstalledColormapsReply * /* pRep */);
>
> -extern _X_EXPORT void SAllocColorReply(
> +extern void SAllocColorReply(
> ClientPtr /* pClient */,
> int /* size */,
> xAllocColorReply * /* pRep */);
>
> -extern _X_EXPORT void SAllocNamedColorReply(
> +extern void SAllocNamedColorReply(
> ClientPtr /* pClient */,
> int /* size */,
> xAllocNamedColorReply * /* pRep */);
>
> -extern _X_EXPORT void SAllocColorCellsReply(
> +extern void SAllocColorCellsReply(
> ClientPtr /* pClient */,
> int /* size */,
> xAllocColorCellsReply * /* pRep */);
>
> -extern _X_EXPORT void SAllocColorPlanesReply(
> +extern void SAllocColorPlanesReply(
> ClientPtr /* pClient */,
> int /* size */,
> xAllocColorPlanesReply * /* pRep */);
>
> -extern _X_EXPORT void SQColorsExtend(
> +extern void SQColorsExtend(
> ClientPtr /* pClient */,
> int /* size */,
> xrgb * /* prgb */);
>
> -extern _X_EXPORT void SQueryColorsReply(
> +extern void SQueryColorsReply(
> ClientPtr /* pClient */,
> int /* size */,
> xQueryColorsReply * /* pRep */);
>
> -extern _X_EXPORT void SLookupColorReply(
> +extern void SLookupColorReply(
> ClientPtr /* pClient */,
> int /* size */,
> xLookupColorReply * /* pRep */);
>
> -extern _X_EXPORT void SQueryBestSizeReply(
> +extern void SQueryBestSizeReply(
> ClientPtr /* pClient */,
> int /* size */,
> xQueryBestSizeReply * /* pRep */);
>
> -extern _X_EXPORT void SListExtensionsReply(
> +extern void SListExtensionsReply(
> ClientPtr /* pClient */,
> int /* size */,
> xListExtensionsReply * /* pRep */);
> @@ -221,44 +221,44 @@ extern void SGetPointerControlReply(
> int /* size */,
> xGetPointerControlReply * /* pRep */);
>
> -extern _X_EXPORT void SGetScreenSaverReply(
> +extern void SGetScreenSaverReply(
> ClientPtr /* pClient */,
> int /* size */,
> xGetScreenSaverReply * /* pRep */);
>
> -extern _X_EXPORT void SLHostsExtend(
> +extern void SLHostsExtend(
> ClientPtr /* pClient */,
> int /* size */,
> char * /* buf */);
>
> -extern _X_EXPORT void SListHostsReply(
> +extern void SListHostsReply(
> ClientPtr /* pClient */,
> int /* size */,
> xListHostsReply * /* pRep */);
>
> -extern _X_EXPORT void SErrorEvent(
> +extern void SErrorEvent(
> xError * /* from */,
> xError * /* to */);
>
> -extern _X_EXPORT void SwapConnSetupInfo(
> +extern void SwapConnSetupInfo(
> char * /* pInfo */,
> char * /* pInfoTBase */);
>
> -extern _X_EXPORT void WriteSConnectionInfo(
> +extern void WriteSConnectionInfo(
> ClientPtr /* pClient */,
> unsigned long /* size */,
> char * /* pInfo */);
>
> -extern _X_EXPORT void SwapConnSetupPrefix(
> +extern void SwapConnSetupPrefix(
> xConnSetupPrefix * /* pcspFrom */,
> xConnSetupPrefix * /* pcspTo */);
>
> -extern _X_EXPORT void WriteSConnSetupPrefix(
> +extern void WriteSConnSetupPrefix(
> ClientPtr /* pClient */,
> xConnSetupPrefix * /* pcsp */);
>
> #undef SWAPREP_PROC
> -#define SWAPREP_PROC(func) extern _X_EXPORT void func(xEvent * /* from */, xEvent * /* to */)
> +#define SWAPREP_PROC(func) extern void func(xEvent * /* from */, xEvent * /* to */)
>
> SWAPREP_PROC(SCirculateEvent);
> SWAPREP_PROC(SClientMessageEvent);
> diff --git a/include/swapreq.h b/include/swapreq.h
> index 8038f02..bfe3a29 100644
> --- a/include/swapreq.h
> +++ b/include/swapreq.h
> @@ -34,7 +34,7 @@ extern _X_EXPORT void SwapConnClientPrefix(
>
> #undef SWAPREQ_PROC
>
> -#define SWAPREQ_PROC(func) extern _X_EXPORT int func(ClientPtr /* client */)
> +#define SWAPREQ_PROC(func) extern int func(ClientPtr /* client */)
>
> SWAPREQ_PROC(SProcAllocColor);
> SWAPREQ_PROC(SProcAllocColorCells);
> --
> 1.7.7.3
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>
More information about the xorg-devel
mailing list