[PATCH 13/31] XFree86: Parser: _X_UNEXPORT

Daniel Stone daniel at fooishbar.org
Fri Dec 2 03:31:19 PST 2011


Remove _X_EXPORT tags from symbols which were never used by drivers.

Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
 hw/xfree86/parser/configProcs.h |    6 +++---
 hw/xfree86/parser/xf86Optrec.h  |   31 +++++++++++++++----------------
 hw/xfree86/parser/xf86Parser.h  |   30 +++++++++++++++---------------
 3 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
index 114cdfe..8c6164a 100644
--- a/hw/xfree86/parser/configProcs.h
+++ b/hw/xfree86/parser/configProcs.h
@@ -60,14 +60,14 @@ int xf86validateLayout(XF86ConfigPtr p);
 /* Module.c */
 XF86ConfModulePtr xf86parseModuleSection(void);
 void xf86printModuleSection(FILE *cf, XF86ConfModulePtr ptr);
-extern _X_EXPORT XF86LoadPtr xf86addNewLoadDirective(XF86LoadPtr head, char *name, int type, XF86OptionPtr opts);
+extern XF86LoadPtr xf86addNewLoadDirective(XF86LoadPtr head, char *name, int type, XF86OptionPtr opts);
 void xf86freeModules(XF86ConfModulePtr ptr);
 /* Monitor.c */
 XF86ConfMonitorPtr xf86parseMonitorSection(void);
 XF86ConfModesPtr xf86parseModesSection(void);
 void xf86printMonitorSection(FILE *cf, XF86ConfMonitorPtr ptr);
 void xf86printModesSection(FILE *cf, XF86ConfModesPtr ptr);
-extern _X_EXPORT void xf86freeMonitorList(XF86ConfMonitorPtr ptr);
+extern void xf86freeMonitorList(XF86ConfMonitorPtr ptr);
 void xf86freeModesList(XF86ConfModesPtr ptr);
 int xf86validateMonitor(XF86ConfigPtr p, XF86ConfScreenPtr screen);
 /* Pointer.c */
@@ -75,7 +75,7 @@ XF86ConfInputPtr xf86parsePointerSection(void);
 /* Screen.c */
 XF86ConfScreenPtr xf86parseScreenSection(void);
 void xf86printScreenSection(FILE *cf, XF86ConfScreenPtr ptr);
-extern _X_EXPORT void xf86freeScreenList(XF86ConfScreenPtr ptr);
+extern void xf86freeScreenList(XF86ConfScreenPtr ptr);
 void xf86freeAdaptorLinkList(XF86ConfAdaptorLinkPtr ptr);
 void xf86freeDisplayList(XF86ConfDisplayPtr ptr);
 void xf86freeModeList(XF86ModePtr ptr);
diff --git a/hw/xfree86/parser/xf86Optrec.h b/hw/xfree86/parser/xf86Optrec.h
index b8e9d61..0e6a2ad 100644
--- a/hw/xfree86/parser/xf86Optrec.h
+++ b/hw/xfree86/parser/xf86Optrec.h
@@ -69,21 +69,20 @@
 
 #include <X11/Xfuncproto.h>
 
-extern _X_EXPORT XF86OptionPtr xf86addNewOption(XF86OptionPtr head, char *name, char *val);
-extern _X_EXPORT XF86OptionPtr xf86optionListDup(XF86OptionPtr opt);
-extern _X_EXPORT void xf86optionListFree(XF86OptionPtr opt);
-extern _X_EXPORT char *xf86optionName(XF86OptionPtr opt);
-extern _X_EXPORT char *xf86optionValue(XF86OptionPtr opt);
-extern _X_EXPORT XF86OptionPtr xf86newOption(char *name, char *value);
-extern _X_EXPORT XF86OptionPtr xf86nextOption(XF86OptionPtr list);
-extern _X_EXPORT XF86OptionPtr xf86findOption(XF86OptionPtr list, const char *name);
-extern _X_EXPORT const char *xf86findOptionValue(XF86OptionPtr list, const char *name);
-extern _X_EXPORT XF86OptionPtr xf86optionListCreate(const char **options, int count, int used);
-extern _X_EXPORT XF86OptionPtr xf86optionListMerge(XF86OptionPtr head, XF86OptionPtr tail);
-extern _X_EXPORT int xf86nameCompare (const char *s1, const char *s2);
-extern _X_EXPORT char *xf86uLongToString(unsigned long i);
-extern _X_EXPORT XF86OptionPtr xf86parseOption(XF86OptionPtr head);
-extern _X_EXPORT void xf86printOptionList(FILE *fp, XF86OptionPtr list, int tabs);
-
+extern XF86OptionPtr xf86addNewOption(XF86OptionPtr head, char *name, char *val);
+extern XF86OptionPtr xf86optionListDup(XF86OptionPtr opt);
+extern void xf86optionListFree(XF86OptionPtr opt);
+extern char *xf86optionName(XF86OptionPtr opt);
+extern char *xf86optionValue(XF86OptionPtr opt);
+extern XF86OptionPtr xf86newOption(char *name, char *value);
+extern XF86OptionPtr xf86nextOption(XF86OptionPtr list);
+extern XF86OptionPtr xf86findOption(XF86OptionPtr list, const char *name);
+extern const char *xf86findOptionValue(XF86OptionPtr list, const char *name);
+extern XF86OptionPtr xf86optionListCreate(const char **options, int count, int used);
+extern XF86OptionPtr xf86optionListMerge(XF86OptionPtr head, XF86OptionPtr tail);
+extern int xf86nameCompare (const char *s1, const char *s2);
+extern char *xf86uLongToString(unsigned long i);
+extern XF86OptionPtr xf86parseOption(XF86OptionPtr head);
+extern void xf86printOptionList(FILE *fp, XF86OptionPtr list, int tabs);
 
 #endif /* _xf86Optrec_h_ */
diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h
index 7d4662b..2e9a820 100644
--- a/hw/xfree86/parser/xf86Parser.h
+++ b/hw/xfree86/parser/xf86Parser.h
@@ -496,24 +496,24 @@ extern XF86ConfigPtr xf86readConfigFile(void);
 extern void xf86closeConfigFile(void);
 extern void xf86freeConfig(XF86ConfigPtr p);
 extern int xf86writeConfigFile(const char *, XF86ConfigPtr);
-extern _X_EXPORT XF86ConfDevicePtr xf86findDevice(const char *ident, XF86ConfDevicePtr p);
-extern _X_EXPORT XF86ConfLayoutPtr xf86findLayout(const char *name, XF86ConfLayoutPtr list);
-extern _X_EXPORT XF86ConfMonitorPtr xf86findMonitor(const char *ident, XF86ConfMonitorPtr p);
-extern _X_EXPORT XF86ConfModesPtr xf86findModes(const char *ident, XF86ConfModesPtr p);
-extern _X_EXPORT XF86ConfModeLinePtr xf86findModeLine(const char *ident, XF86ConfModeLinePtr p);
-extern _X_EXPORT XF86ConfScreenPtr xf86findScreen(const char *ident, XF86ConfScreenPtr p);
-extern _X_EXPORT XF86ConfInputPtr xf86findInput(const char *ident, XF86ConfInputPtr p);
-extern _X_EXPORT XF86ConfInputPtr xf86findInputByDriver(const char *driver, XF86ConfInputPtr p);
-extern _X_EXPORT XF86ConfVideoAdaptorPtr xf86findVideoAdaptor(const char *ident,
+extern XF86ConfDevicePtr xf86findDevice(const char *ident, XF86ConfDevicePtr p);
+extern XF86ConfLayoutPtr xf86findLayout(const char *name, XF86ConfLayoutPtr list);
+extern XF86ConfMonitorPtr xf86findMonitor(const char *ident, XF86ConfMonitorPtr p);
+extern XF86ConfModesPtr xf86findModes(const char *ident, XF86ConfModesPtr p);
+extern XF86ConfModeLinePtr xf86findModeLine(const char *ident, XF86ConfModeLinePtr p);
+extern XF86ConfScreenPtr xf86findScreen(const char *ident, XF86ConfScreenPtr p);
+extern XF86ConfInputPtr xf86findInput(const char *ident, XF86ConfInputPtr p);
+extern XF86ConfInputPtr xf86findInputByDriver(const char *driver, XF86ConfInputPtr p);
+extern XF86ConfVideoAdaptorPtr xf86findVideoAdaptor(const char *ident,
 						XF86ConfVideoAdaptorPtr p);
 extern int xf86layoutAddInputDevices(XF86ConfigPtr config, XF86ConfLayoutPtr layout);
 
-extern _X_EXPORT GenericListPtr xf86addListItem(GenericListPtr head, GenericListPtr c_new);
-extern _X_EXPORT int xf86itemNotSublist(GenericListPtr list_1, GenericListPtr list_2);
+extern GenericListPtr xf86addListItem(GenericListPtr head, GenericListPtr c_new);
+extern int xf86itemNotSublist(GenericListPtr list_1, GenericListPtr list_2);
 
-extern _X_EXPORT int xf86pathIsAbsolute(const char *path);
-extern _X_EXPORT int xf86pathIsSafe(const char *path);
-extern _X_EXPORT char *xf86addComment(char *cur, char *add);
-extern _X_EXPORT Bool xf86getBoolValue(Bool *val, const char *str);
+extern int xf86pathIsAbsolute(const char *path);
+extern int xf86pathIsSafe(const char *path);
+extern char *xf86addComment(char *cur, char *add);
+extern Bool xf86getBoolValue(Bool *val, const char *str);
 
 #endif /* _xf86Parser_h_ */
-- 
1.7.7.3



More information about the xorg-devel mailing list