[PATCH 21/31] XFree86: _X_UNEXPORT

Peter Hutterer peter.hutterer at who-t.net
Tue Dec 6 14:50:03 PST 2011


On Fri, Dec 02, 2011 at 11:31:27AM +0000, Daniel Stone wrote:
> Unexport all the remaining _X_EXPORTed XFree86 symbols not used by any
> drivers.
> 
> Signed-off-by: Daniel Stone <daniel at fooishbar.org>

Needed externally:
xf86OptionName(XF86OptionPtr opt);
xf86OptionValue(XF86OptionPtr opt);
xf86OptionListReport(XF86OptionPtr parm);
xf86NextOption(XF86OptionPtr list );

Cheers,
  Peter

> ---
>  hw/xfree86/common/xf86.h           |   93 ++++++++++++--------------
>  hw/xfree86/common/xf86Opt.h        |   20 +++---
>  hw/xfree86/common/xf86Priv.h       |  128 ++++++++++++++++++------------------
>  hw/xfree86/common/xf86Xinput.h     |    4 +-
>  hw/xfree86/common/xf86cmap.h       |    2 +-
>  hw/xfree86/common/xf86fbman.h      |    2 +-
>  hw/xfree86/common/xf86xv.h         |    2 +-
>  hw/xfree86/common/xf86xvpriv.h     |    2 +-
>  hw/xfree86/ramdac/xf86CursorPriv.h |    2 +-
>  hw/xfree86/ramdac/xf86RamDac.h     |    4 +-
>  10 files changed, 126 insertions(+), 133 deletions(-)
> 
> diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
> index 906d878..35b134b 100644
> --- a/hw/xfree86/common/xf86.h
> +++ b/hw/xfree86/common/xf86.h
> @@ -52,36 +52,29 @@
>  #include "propertyst.h"
>  
>  /* General parameters */
> -extern _X_EXPORT int xf86DoConfigure;
> -extern _X_EXPORT int xf86DoShowOptions;
> -extern _X_EXPORT Bool xf86DoConfigurePass1;
> +extern int xf86DoConfigure;
> +extern int xf86DoShowOptions;
> +extern Bool xf86DoConfigurePass1;
>  
>  extern _X_EXPORT DevPrivateKeyRec xf86ScreenKeyRec;
>  #define xf86ScreenKey (&xf86ScreenKeyRec)
>  
> -extern _X_EXPORT DevPrivateKeyRec xf86CreateRootWindowKeyRec;
> +extern DevPrivateKeyRec xf86CreateRootWindowKeyRec;
>  #define xf86CreateRootWindowKey (&xf86CreateRootWindowKeyRec)
>  
>  extern _X_EXPORT ScrnInfoPtr *xf86Screens;	/* List of pointers to ScrnInfoRecs */
>  extern _X_EXPORT const unsigned char byte_reversed[256];
> -extern _X_EXPORT Bool fbSlotClaimed;
> +extern Bool fbSlotClaimed;
>  #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
> -extern _X_EXPORT Bool sbusSlotClaimed;
> +extern Bool sbusSlotClaimed;
>  #endif
>  extern _X_EXPORT confDRIRec xf86ConfigDRI;
> -extern _X_EXPORT Bool xf86DRI2Enabled(void);
> +extern Bool xf86DRI2Enabled(void);
>  
> -extern _X_EXPORT Bool VTSwitchEnabled;	/* kbd driver */
> +extern Bool VTSwitchEnabled;	/* kbd driver */
>  
>  #define XF86SCRNINFO(p) ((ScrnInfoPtr)dixLookupPrivate(&(p)->devPrivates, \
>  						       xf86ScreenKey))
> -#define XF86FLIP_PIXELS() \
> -	do { \
> -	    if (xf86GetFlipPixels()) { \
> -		pScreen->whitePixel = (pScreen->whitePixel) ? 0 : 1; \
> -		pScreen->blackPixel = (pScreen->blackPixel) ? 0 : 1; \
> -	   } \
> -	while (0)
>  
>  #define BOOLTOSTRING(b) ((b) ? "TRUE" : "FALSE")
>  
> @@ -94,7 +87,7 @@ extern _X_EXPORT Bool VTSwitchEnabled;	/* kbd driver */
>  /* PCI related */
>  #ifdef XSERVER_LIBPCIACCESS
>  #include <pciaccess.h>
> -extern _X_EXPORT Bool pciSlotClaimed;
> +extern Bool pciSlotClaimed;
>  
>  extern _X_EXPORT Bool xf86CheckPciSlot(const struct pci_device *);
>  extern _X_EXPORT int xf86ClaimPciSlot(struct pci_device *, DriverPtr drvp,
> @@ -130,10 +123,10 @@ extern _X_EXPORT Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn,
>  
>  /* xf86Bus.c */
>  
> -extern _X_EXPORT int  xf86GetFbInfoForScreen(int scrnIndex);
> +extern int  xf86GetFbInfoForScreen(int scrnIndex);
>  extern _X_EXPORT int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
>  extern _X_EXPORT int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
> -extern _X_EXPORT Bool xf86DriverHasEntities(DriverPtr drvp);
> +extern Bool xf86DriverHasEntities(DriverPtr drvp);
>  extern _X_EXPORT void xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex);
>  extern _X_EXPORT void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex,
>  				    int instance);
> @@ -141,7 +134,7 @@ extern _X_EXPORT int xf86GetNumEntityInstances(int entityIndex);
>  extern _X_EXPORT GDevPtr xf86GetDevFromEntity(int entityIndex, int instance);
>  extern _X_EXPORT void xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex);
>  extern _X_EXPORT EntityInfoPtr xf86GetEntityInfo(int entityIndex);
> -extern _X_EXPORT Bool xf86SetEntityFuncs(int entityIndex, EntityProc init,
> +extern Bool xf86SetEntityFuncs(int entityIndex, EntityProc init,
>  			EntityProc enter, EntityProc leave, pointer);
>  extern _X_EXPORT Bool xf86IsEntityPrimary(int entityIndex);
>  extern _X_EXPORT ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);
> @@ -159,18 +152,18 @@ extern _X_EXPORT int xf86AllocateEntityPrivateIndex(void);
>  extern _X_EXPORT DevUnion *xf86GetEntityPrivate(int entityIndex, int privIndex);
>  
>  /* xf86Configure.c */
> -extern _X_EXPORT GDevPtr xf86AddBusDeviceToConfigure(const char *driver, BusType bus,
> +extern GDevPtr xf86AddBusDeviceToConfigure(const char *driver, BusType bus,
>  				    void *busData, int chipset);
>  
>  /* xf86Cursor.c */
>  
> -extern _X_EXPORT void xf86LockZoom(ScreenPtr pScreen, int lock);
> -extern _X_EXPORT void xf86InitViewport(ScrnInfoPtr pScr);
> +extern void xf86LockZoom(ScreenPtr pScreen, int lock);
> +extern void xf86InitViewport(ScrnInfoPtr pScr);
>  extern _X_EXPORT void xf86SetViewport(ScreenPtr pScreen, int x, int y);
> -extern _X_EXPORT void xf86ZoomViewport(ScreenPtr pScreen, int zoom);
> +extern void xf86ZoomViewport(ScreenPtr pScreen, int zoom);
>  extern _X_EXPORT Bool xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode);
>  extern _X_EXPORT void *xf86GetPointerScreenFuncs(void);
> -extern _X_EXPORT void xf86InitOrigins(void);
> +extern void xf86InitOrigins(void);
>  extern _X_EXPORT void xf86ReconfigureLayout(void);
>  
>  /* xf86cvt.c */
> @@ -207,12 +200,12 @@ extern _X_EXPORT pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, po
>  extern _X_EXPORT int xf86RemoveGeneralHandler(pointer handler);
>  extern _X_EXPORT void xf86DisableGeneralHandler(pointer handler);
>  extern _X_EXPORT void xf86EnableGeneralHandler(pointer handler);
> -extern _X_EXPORT InputHandlerProc xf86SetConsoleHandler(InputHandlerProc handler, pointer data);
> -extern _X_EXPORT void xf86InterceptSignals(int *signo);
> +extern InputHandlerProc xf86SetConsoleHandler(InputHandlerProc handler, pointer data);
> +extern void xf86InterceptSignals(int *signo);
>  extern _X_EXPORT void xf86InterceptSigIll(void (*sigillhandler)(void));
> -extern _X_EXPORT Bool xf86EnableVTSwitch(Bool new);
> -extern _X_EXPORT void xf86ProcessActionEvent(ActionEvent action, void *arg);
> -extern _X_EXPORT void xf86PrintBacktrace(void);
> +extern Bool xf86EnableVTSwitch(Bool new);
> +extern void xf86ProcessActionEvent(ActionEvent action, void *arg);
> +extern void xf86PrintBacktrace(void);
>  
>  /* xf86Helper.c */
>  
> @@ -221,7 +214,7 @@ extern _X_EXPORT void xf86DeleteDriver(int drvIndex);
>  extern _X_EXPORT ScrnInfoPtr xf86AllocateScreen(DriverPtr drv, int flags);
>  extern _X_EXPORT void xf86DeleteScreen(int scrnIndex, int flags);
>  extern _X_EXPORT int xf86AllocateScrnInfoPrivateIndex(void);
> -extern _X_EXPORT Bool xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad);
> +extern Bool xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad);
>  extern _X_EXPORT Bool xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int bpp, int fbbpp,
>  		     int depth24flags);
>  extern _X_EXPORT void xf86PrintDepthBpp(ScrnInfoPtr scrp);
> @@ -250,21 +243,21 @@ extern _X_EXPORT void xf86PrintChipsets(const char *drvname, const char *drvmsg,
>  extern _X_EXPORT int xf86MatchDevice(const char *drivername, GDevPtr **driversectlist);
>  extern _X_EXPORT const char *xf86GetVisualName(int visual);
>  extern _X_EXPORT int xf86GetVerbosity(void);
> -extern _X_EXPORT Pix24Flags xf86GetPix24(void);
> -extern _X_EXPORT int xf86GetDepth(void);
> -extern _X_EXPORT rgb xf86GetWeight(void);
> -extern _X_EXPORT Gamma xf86GetGamma(void);
> +extern Pix24Flags xf86GetPix24(void);
> +extern int xf86GetDepth(void);
> +extern rgb xf86GetWeight(void);
> +extern Gamma xf86GetGamma(void);
>  extern _X_EXPORT Bool xf86GetFlipPixels(void);
>  extern _X_EXPORT const char *xf86GetServerName(void);
>  extern _X_EXPORT Bool xf86ServerIsExiting(void);
> -extern _X_EXPORT Bool xf86ServerIsResetting(void);
> -extern _X_EXPORT Bool xf86ServerIsInitialising(void);
> -extern _X_EXPORT Bool xf86ServerIsOnlyDetecting(void);
> -extern _X_EXPORT Bool xf86CaughtSignal(void);
> -extern _X_EXPORT Bool xf86GetVidModeAllowNonLocal(void);
> -extern _X_EXPORT Bool xf86GetVidModeEnabled(void);
> -extern _X_EXPORT Bool xf86GetModInDevAllowNonLocal(void);
> -extern _X_EXPORT Bool xf86GetModInDevEnabled(void);
> +extern Bool xf86ServerIsResetting(void);
> +extern Bool xf86ServerIsInitialising(void);
> +extern Bool xf86ServerIsOnlyDetecting(void);
> +extern Bool xf86CaughtSignal(void);
> +extern Bool xf86GetVidModeAllowNonLocal(void);
> +extern Bool xf86GetVidModeEnabled(void);
> +extern Bool xf86GetModInDevAllowNonLocal(void);
> +extern Bool xf86GetModInDevEnabled(void);
>  extern _X_EXPORT Bool xf86GetAllowMouseOpenFail(void);
>  extern _X_EXPORT void xf86DisableRandR(void);
>  extern _X_EXPORT CARD32 xorgGetVersion(void);
> @@ -284,7 +277,7 @@ extern _X_EXPORT ScrnInfoPtr xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag,
>  			       EntityProc enter, EntityProc leave,
>  			       pointer private);
>  
> -extern _X_EXPORT Bool xf86IsScreenPrimary(int scrnIndex);
> +extern Bool xf86IsScreenPrimary(int scrnIndex);
>  extern _X_EXPORT int  xf86RegisterRootWindowProperty(int ScrnIndex, Atom	property, Atom type,
>  				    int format, unsigned long len,
>  				    pointer value);
> @@ -292,7 +285,7 @@ extern _X_EXPORT Bool xf86IsUnblank(int mode);
>  
>  /* xf86Init.c */
>  
> -extern _X_EXPORT PixmapFormatPtr xf86GetPixFormat(ScrnInfoPtr pScrn, int depth);
> +extern PixmapFormatPtr xf86GetPixFormat(ScrnInfoPtr pScrn, int depth);
>  extern _X_EXPORT int xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth);
>  
>  /* xf86Mode.c */
> @@ -300,15 +293,15 @@ extern _X_EXPORT int xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth);
>  extern _X_EXPORT int xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2,
>  			int DivFactor, int MulFactor, int *divider);
>  extern _X_EXPORT const char *xf86ModeStatusToString(ModeStatus status);
> -extern _X_EXPORT ModeStatus xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep,
> +extern ModeStatus xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep,
>  			  ClockRangePtr clockRanges, LookupModeFlags strategy);
>  extern _X_EXPORT ModeStatus xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor);
> -extern _X_EXPORT ModeStatus xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
> +extern ModeStatus xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
>  					 ClockRangePtr clockRanges,
>  					 LookupModeFlags strategy,
>  					 int maxPitch, int virtualX,
>  					 int virtualY);
> -extern _X_EXPORT ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
> +extern ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
>  				  int flags);
>  extern _X_EXPORT int xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
>  		      char **modeNames, ClockRangePtr clockRanges,
> @@ -339,9 +332,9 @@ extern _X_EXPORT void xf86CollectOptions(ScrnInfoPtr pScrn, XF86OptionPtr extraO
>  
>  /* xf86RandR.c */
>  #ifdef RANDR
> -extern _X_EXPORT Bool xf86RandRInit (ScreenPtr    pScreen);
> -extern _X_EXPORT Rotation xf86GetRotation(ScreenPtr pScreen);
> -extern _X_EXPORT Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen,
> +extern Bool xf86RandRInit (ScreenPtr    pScreen);
> +extern Rotation xf86GetRotation(ScreenPtr pScreen);
> +extern Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen,
>  			int newvirtX, int newvirtY,
>  			int newmmWidth, int newmmHeight, Bool resetMode);
>  #endif
> diff --git a/hw/xfree86/common/xf86Opt.h b/hw/xfree86/common/xf86Opt.h
> index b0fdaa6..81d265f 100644
> --- a/hw/xfree86/common/xf86Opt.h
> +++ b/hw/xfree86/common/xf86Opt.h
> @@ -81,25 +81,25 @@ extern _X_EXPORT char *xf86CheckStrOption(XF86OptionPtr optlist, const char *nam
>  extern _X_EXPORT int xf86CheckBoolOption(XF86OptionPtr list, const char *name, int deflt );
>  extern _X_EXPORT double xf86CheckPercentOption(XF86OptionPtr list, const char *name, double deflt );
>  extern _X_EXPORT XF86OptionPtr xf86AddNewOption(XF86OptionPtr head, const char *name, const char *val );
> -extern _X_EXPORT XF86OptionPtr xf86NewOption(char *name, char *value );
> -extern _X_EXPORT XF86OptionPtr xf86NextOption(XF86OptionPtr list );
> +extern XF86OptionPtr xf86NewOption(char *name, char *value );
> +extern XF86OptionPtr xf86NextOption(XF86OptionPtr list );
>  extern _X_EXPORT XF86OptionPtr xf86OptionListCreate(const char **options, int count, int used);
>  extern _X_EXPORT XF86OptionPtr xf86OptionListMerge(XF86OptionPtr head, XF86OptionPtr tail);
>  extern _X_EXPORT XF86OptionPtr xf86OptionListDuplicate(XF86OptionPtr list);
>  extern _X_EXPORT void xf86OptionListFree(XF86OptionPtr opt);
> -extern _X_EXPORT char *xf86OptionName(XF86OptionPtr opt);
> -extern _X_EXPORT char *xf86OptionValue(XF86OptionPtr opt);
> -extern _X_EXPORT void xf86OptionListReport(XF86OptionPtr parm);
> +extern char *xf86OptionName(XF86OptionPtr opt);
> +extern char *xf86OptionValue(XF86OptionPtr opt);
> +extern void xf86OptionListReport(XF86OptionPtr parm);
>  extern _X_EXPORT XF86OptionPtr xf86FindOption(XF86OptionPtr options, const char *name);
>  extern _X_EXPORT const char *xf86FindOptionValue(XF86OptionPtr options, const char *name);
> -extern _X_EXPORT void xf86MarkOptionUsed(XF86OptionPtr option);
> +extern void xf86MarkOptionUsed(XF86OptionPtr option);
>  extern _X_EXPORT void xf86MarkOptionUsedByName(XF86OptionPtr options, const char *name);
> -extern _X_EXPORT Bool xf86CheckIfOptionUsed(XF86OptionPtr option);
> -extern _X_EXPORT Bool xf86CheckIfOptionUsedByName(XF86OptionPtr options, const char *name);
> +extern Bool xf86CheckIfOptionUsed(XF86OptionPtr option);
> +extern Bool xf86CheckIfOptionUsedByName(XF86OptionPtr options, const char *name);
>  extern _X_EXPORT void xf86ShowUnusedOptions(int scrnIndex, XF86OptionPtr options);
>  extern _X_EXPORT void xf86ProcessOptions(int scrnIndex, XF86OptionPtr options, OptionInfoPtr optinfo);
>  extern _X_EXPORT OptionInfoPtr xf86TokenToOptinfo(const OptionInfoRec *table, int token);
> -extern _X_EXPORT const char *xf86TokenToOptName(const OptionInfoRec *table, int token);
> +extern const char *xf86TokenToOptName(const OptionInfoRec *table, int token);
>  extern _X_EXPORT Bool xf86IsOptionSet(const OptionInfoRec *table, int token);
>  extern _X_EXPORT char *xf86GetOptValString(const OptionInfoRec *table, int token);
>  extern _X_EXPORT Bool xf86GetOptValInteger(const OptionInfoRec *table, int token, int *value);
> @@ -110,7 +110,7 @@ extern _X_EXPORT Bool xf86GetOptValFreq(const OptionInfoRec *table, int token,
>  extern _X_EXPORT Bool xf86GetOptValBool(const OptionInfoRec *table, int token, Bool *value);
>  extern _X_EXPORT Bool xf86ReturnOptValBool(const OptionInfoRec *table, int token, Bool def);
>  extern _X_EXPORT int xf86NameCmp(const char *s1, const char *s2);
> -extern _X_EXPORT char *xf86NormalizeName(const char *s);
> +extern char *xf86NormalizeName(const char *s);
>  extern _X_EXPORT XF86OptionPtr xf86ReplaceIntOption(XF86OptionPtr optlist,  const char *name, const int val);
>  extern _X_EXPORT XF86OptionPtr xf86ReplaceRealOption(XF86OptionPtr optlist,  const char *name, const double val);
>  extern _X_EXPORT XF86OptionPtr xf86ReplaceBoolOption(XF86OptionPtr optlist, const char *name, const Bool val);
> diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
> index 8c69859..6f9a80f 100644
> --- a/hw/xfree86/common/xf86Priv.h
> +++ b/hw/xfree86/common/xf86Priv.h
> @@ -43,55 +43,55 @@
>   * Parameters set ONLY from the command line options
>   * The global state of these things is held in xf86InfoRec (when appropriate).
>   */
> -extern _X_EXPORT const char *xf86ConfigFile;
> -extern _X_EXPORT const char *xf86ConfigDir;
> -extern _X_EXPORT  Bool xf86AllowMouseOpenFail;
> +extern const char *xf86ConfigFile;
> +extern const char *xf86ConfigDir;
> +extern Bool xf86AllowMouseOpenFail;
>  #ifdef XF86VIDMODE
> -extern _X_EXPORT  Bool xf86VidModeDisabled;
> -extern _X_EXPORT  Bool xf86VidModeAllowNonLocal;
> +extern Bool xf86VidModeDisabled;
> +extern Bool xf86VidModeAllowNonLocal;
>  #endif 
> -extern _X_EXPORT  Bool xf86fpFlag;
> -extern _X_EXPORT  Bool xf86sFlag;
> -extern _X_EXPORT  Bool xf86bsEnableFlag;
> -extern _X_EXPORT  Bool xf86bsDisableFlag;
> -extern _X_EXPORT  Bool xf86silkenMouseDisableFlag;
> -extern _X_EXPORT  Bool xf86xkbdirFlag;
> +extern Bool xf86fpFlag;
> +extern Bool xf86sFlag;
> +extern Bool xf86bsEnableFlag;
> +extern Bool xf86bsDisableFlag;
> +extern Bool xf86silkenMouseDisableFlag;
> +extern Bool xf86xkbdirFlag;
>  #ifdef HAVE_ACPI
> -extern _X_EXPORT  Bool xf86acpiDisableFlag;
> +extern Bool xf86acpiDisableFlag;
>  #endif
> -extern _X_EXPORT  char *xf86LayoutName;
> -extern _X_EXPORT  char *xf86ScreenName;
> -extern _X_EXPORT  char *xf86PointerName;
> -extern _X_EXPORT  char *xf86KeyboardName;
> -extern _X_EXPORT  int xf86FbBpp;
> -extern _X_EXPORT  int xf86Depth;
> -extern _X_EXPORT  Pix24Flags xf86Pix24;
> -extern _X_EXPORT  rgb xf86Weight;
> -extern _X_EXPORT  Bool xf86FlipPixels;
> -extern _X_EXPORT  Gamma xf86Gamma;
> -extern _X_EXPORT  const char *xf86ServerName;
> +extern char *xf86LayoutName;
> +extern char *xf86ScreenName;
> +extern char *xf86PointerName;
> +extern char *xf86KeyboardName;
> +extern int xf86FbBpp;
> +extern int xf86Depth;
> +extern Pix24Flags xf86Pix24;
> +extern rgb xf86Weight;
> +extern Bool xf86FlipPixels;
> +extern Gamma xf86Gamma;
> +extern const char *xf86ServerName;
>  
>  /* Other parameters */
>  
>  extern _X_EXPORT  xf86InfoRec xf86Info;
> -extern _X_EXPORT  const char *xf86ModulePath;
> -extern _X_EXPORT  MessageType xf86ModPathFrom;
> -extern _X_EXPORT  const char *xf86LogFile;
> -extern _X_EXPORT  MessageType xf86LogFileFrom;
> -extern _X_EXPORT  Bool xf86LogFileWasOpened;
> -extern _X_EXPORT  serverLayoutRec xf86ConfigLayout;
> -
> -extern _X_EXPORT  DriverPtr *xf86DriverList;
> -extern _X_EXPORT  int xf86NumDrivers;
> -extern _X_EXPORT  Bool xf86Resetting;
> -extern _X_EXPORT  Bool xf86Initialising;
> -extern _X_EXPORT  int xf86NumScreens;
> -extern _X_EXPORT  const char *xf86VisualNames[];
> -extern _X_EXPORT  int xf86Verbose;                 /* verbosity level */
> -extern _X_EXPORT  int xf86LogVerbose;		/* log file verbosity level */
> -extern _X_EXPORT  Bool xorgHWAccess;
> -
> -extern _X_EXPORT  RootWinPropPtr *xf86RegisteredPropertiesTable;
> +extern const char *xf86ModulePath;
> +extern MessageType xf86ModPathFrom;
> +extern const char *xf86LogFile;
> +extern MessageType xf86LogFileFrom;
> +extern Bool xf86LogFileWasOpened;
> +extern serverLayoutRec xf86ConfigLayout;
> +
> +extern DriverPtr *xf86DriverList;
> +extern int xf86NumDrivers;
> +extern Bool xf86Resetting;
> +extern Bool xf86Initialising;
> +extern int xf86NumScreens;
> +extern const char *xf86VisualNames[];
> +extern int xf86Verbose;                 /* verbosity level */
> +extern _X_EXPORT int xf86LogVerbose;		/* log file verbosity level */
> +extern Bool xorgHWAccess;
> +
> +extern RootWinPropPtr *xf86RegisteredPropertiesTable;
>  
>  #ifndef DEFAULT_VERBOSE
>  #define DEFAULT_VERBOSE		0
> @@ -107,46 +107,46 @@ extern _X_EXPORT  RootWinPropPtr *xf86RegisteredPropertiesTable;
>  #ifndef _NO_XF86_PROTOTYPES
>  
>  /* xf86Bus.c */
> -extern _X_EXPORT Bool xf86BusConfig(void);
> -extern _X_EXPORT void xf86BusProbe(void);
> -extern _X_EXPORT void xf86AccessEnter(void);
> -extern _X_EXPORT void xf86AccessLeave(void);
> -extern _X_EXPORT void xf86PostProbe(void);
> -extern _X_EXPORT void xf86ClearEntityListForScreen(int scrnIndex);
> -extern _X_EXPORT void xf86AddDevToEntity(int entityIndex, GDevPtr dev);
> +extern Bool xf86BusConfig(void);
> +extern void xf86BusProbe(void);
> +extern void xf86AccessEnter(void);
> +extern void xf86AccessLeave(void);
> +extern void xf86PostProbe(void);
> +extern void xf86ClearEntityListForScreen(int scrnIndex);
> +extern void xf86AddDevToEntity(int entityIndex, GDevPtr dev);
>  
>  /* xf86Config.c */
>  
> -extern _X_EXPORT Bool xf86PathIsSafe(const char *path);
> +extern Bool xf86PathIsSafe(const char *path);
>  
>  /* xf86DefaultModes */
>  
> -extern _X_EXPORT const DisplayModeRec xf86DefaultModes[];
> -extern _X_EXPORT const int xf86NumDefaultModes;
> +extern const DisplayModeRec xf86DefaultModes[];
> +extern const int xf86NumDefaultModes;
>  
>  /* xf86Configure.c */
> -extern _X_EXPORT void DoConfigure(void);
> +extern void DoConfigure(void);
>  
>  /* xf86ShowOpts.c */
> -extern _X_EXPORT void DoShowOptions(void);
> +extern void DoShowOptions(void);
>  
>  /* xf86Events.c */
>  
> -extern _X_EXPORT void xf86Wakeup(pointer blockData, int err, pointer pReadmask);
> -extern _X_HIDDEN int xf86SigWrapper(int signo);
> -extern _X_EXPORT void xf86HandlePMEvents(int fd, pointer data);
> -extern _X_EXPORT int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num);
> -extern _X_EXPORT pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event);
> +extern void xf86Wakeup(pointer blockData, int err, pointer pReadmask);
> +extern int xf86SigWrapper(int signo);
> +extern void xf86HandlePMEvents(int fd, pointer data);
> +extern int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num);
> +extern pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event);
>  
>  /* xf86Helper.c */
> -extern _X_EXPORT void xf86LogInit(void);
> -extern _X_EXPORT void xf86CloseLog(enum ExitCode error);
> +extern void xf86LogInit(void);
> +extern void xf86CloseLog(enum ExitCode error);
>  
>  /* xf86Init.c */
> -extern _X_EXPORT Bool xf86LoadModules(char **list, pointer *optlist);
> -extern _X_EXPORT int xf86SetVerbosity(int verb);
> -extern _X_EXPORT int xf86SetLogVerbosity(int verb);
> -extern _X_EXPORT Bool xf86CallDriverProbe( struct _DriverRec * drv, Bool detect_only );
> +extern Bool xf86LoadModules(char **list, pointer *optlist);
> +extern int xf86SetVerbosity(int verb);
> +extern int xf86SetLogVerbosity(int verb);
> +extern Bool xf86CallDriverProbe( struct _DriverRec * drv, Bool detect_only );
>  
>  #endif /* _NO_XF86_PROTOTYPES */
>  
> diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
> index 909fb57..ef47cdf 100644
> --- a/hw/xfree86/common/xf86Xinput.h
> +++ b/hw/xfree86/common/xf86Xinput.h
> @@ -159,8 +159,8 @@ InputInfoPtr xf86AllocateInput(void);
>  /* xf86Helper.c */
>  extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags);
>  extern _X_EXPORT void xf86DeleteInputDriver(int drvIndex);
> -extern _X_EXPORT InputDriverPtr xf86LookupInputDriver(const char *name);
> -extern _X_EXPORT InputInfoPtr xf86LookupInput(const char *name);
> +extern InputDriverPtr xf86LookupInputDriver(const char *name);
> +extern InputInfoPtr xf86LookupInput(const char *name);
>  extern _X_EXPORT void xf86DeleteInput(InputInfoPtr pInp, int flags);
>  extern _X_EXPORT void xf86MotionHistoryAllocate(InputInfoPtr pInfo);
>  extern _X_EXPORT void xf86IDrvMsgVerb(InputInfoPtr dev,
> diff --git a/hw/xfree86/common/xf86cmap.h b/hw/xfree86/common/xf86cmap.h
> index 649f078..fcbd68d 100644
> --- a/hw/xfree86/common/xf86cmap.h
> +++ b/hw/xfree86/common/xf86cmap.h
> @@ -45,7 +45,7 @@ extern _X_EXPORT Bool xf86HandleColormaps(
>      unsigned int flags
>  );
>  
> -extern _X_EXPORT Bool xf86ColormapAllocatePrivates(
> +extern Bool xf86ColormapAllocatePrivates(
>      ScrnInfoPtr pScrn
>  );
>  
> diff --git a/hw/xfree86/common/xf86fbman.h b/hw/xfree86/common/xf86fbman.h
> index 1b3c316..d238c66 100644
> --- a/hw/xfree86/common/xf86fbman.h
> +++ b/hw/xfree86/common/xf86fbman.h
> @@ -110,7 +110,7 @@ typedef struct {
>  } FBManagerFuncs, *FBManagerFuncsPtr;
>  
>  
> -extern _X_EXPORT Bool xf86RegisterOffscreenManager(
> +extern Bool xf86RegisterOffscreenManager(
>      ScreenPtr pScreen, 
>      FBManagerFuncsPtr funcs
>  );
> diff --git a/hw/xfree86/common/xf86xv.h b/hw/xfree86/common/xf86xv.h
> index a8401ca..f41051c 100644
> --- a/hw/xfree86/common/xf86xv.h
> +++ b/hw/xfree86/common/xf86xv.h
> @@ -244,7 +244,7 @@ xf86XVFillKeyHelper (ScreenPtr pScreen, CARD32 key, RegionPtr clipboxes);
>  extern _X_EXPORT void
>  xf86XVFillKeyHelperDrawable (DrawablePtr pDraw, CARD32 key, RegionPtr clipboxes);
>  
> -extern _X_EXPORT void
> +extern void
>  xf86XVFillKeyHelperPort (DrawablePtr pDraw, pointer data, CARD32 key, RegionPtr clipboxes, Bool fillEverything);
>  
>  extern _X_EXPORT Bool
> diff --git a/hw/xfree86/common/xf86xvpriv.h b/hw/xfree86/common/xf86xvpriv.h
> index 2a459f1..2851c81 100644
> --- a/hw/xfree86/common/xf86xvpriv.h
> +++ b/hw/xfree86/common/xf86xvpriv.h
> @@ -34,7 +34,7 @@
>  
>  /*** These are DDX layer privates ***/
>  
> -extern _X_EXPORT DevPrivateKey XF86XvScreenKey;
> +extern DevPrivateKey XF86XvScreenKey;
>  
>  typedef struct {
>     DestroyWindowProcPtr		DestroyWindow;
> diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h
> index d22d88d..e7d6584 100644
> --- a/hw/xfree86/ramdac/xf86CursorPriv.h
> +++ b/hw/xfree86/ramdac/xf86CursorPriv.h
> @@ -45,7 +45,7 @@ Bool xf86InitHardwareCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr);
>  
>  CARD32 xf86ReverseBitOrder(CARD32 data);
>  
> -extern _X_EXPORT DevPrivateKeyRec xf86CursorScreenKeyRec;
> +extern DevPrivateKeyRec xf86CursorScreenKeyRec;
>  #define xf86CursorScreenKey (&xf86CursorScreenKeyRec)
>  
>  #endif /* _XF86CURSORPRIV_H */
> diff --git a/hw/xfree86/ramdac/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h
> index 4a3900b..1162cbd 100644
> --- a/hw/xfree86/ramdac/xf86RamDac.h
> +++ b/hw/xfree86/ramdac/xf86RamDac.h
> @@ -101,8 +101,8 @@ typedef struct _RamdacScreenRec {
>  } RamDacScreenRec, *RamDacScreenRecPtr;
>  #define RAMDACSCRPTR(p) ((RamDacScreenRecPtr)((p)->privates[RamDacGetScreenIndex()].ptr))->RamDacRec
>  
> -extern _X_EXPORT int RamDacHWPrivateIndex;
> -extern _X_EXPORT int RamDacScreenPrivateIndex;
> +extern int RamDacHWPrivateIndex;
> +extern int RamDacScreenPrivateIndex;
>  
>  typedef struct {
>      int		token;
> -- 
> 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