Re: [PATCH 21/31] XFree86: _X_UNEXPORT

2012-01-04 Thread Daniel Stone
On Wed, Dec 07, 2011 at 08:50:03AM +1000, Peter Hutterer wrote:
 On Fri, Dec 02, 2011 at 11:31:27AM +, Daniel Stone wrote:
  Unexport all the remaining _X_EXPORTed XFree86 symbols not used by any
  drivers.
  
  Signed-off-by: Daniel Stone dan...@fooishbar.org
 
 Needed externally:
 xf86OptionName(XF86OptionPtr opt);
 xf86OptionValue(XF86OptionPtr opt);
 xf86OptionListReport(XF86OptionPtr parm);
 xf86NextOption(XF86OptionPtr list );

Fixed, thanks.

Cheers,
Daniel
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel


Re: [PATCH 21/31] XFree86: _X_UNEXPORT

2011-12-06 Thread Peter Hutterer
On Fri, Dec 02, 2011 at 11:31:27AM +, Daniel Stone wrote:
 Unexport all the remaining _X_EXPORTed XFree86 symbols not used by any
 drivers.
 
 Signed-off-by: Daniel Stone dan...@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,