xserver: Branch 'master'

[Paulo Cesar Pereira de Andrade]

 hw/xfree86/parser/configProcs.h |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit ed4a17274015ecd8040ae85bd5cd9d1dbcc9460a
Author: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
Date:   Sun Dec 7 14:59:25 2008 -0200

    Export some symbols from libxf86config when installing it.
    
      These are private symbols, but used by the X Server.
      The newly exported symbols were not added to the sdk headers.
      Optionally, libxf86config could be compiled without hidden symbols
    when being installed.
      Thanks to Maarten Maathuis for noticing the problem.

diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
index 3c9ce7a..26ba40e 100644
--- a/hw/xfree86/parser/configProcs.h
+++ b/hw/xfree86/parser/configProcs.h
@@ -27,6 +27,9 @@
 
 /* Private procs.  Public procs are in xf86Parser.h and xf86Optrec.h */
 
+/* exported functions are/were used by the X Server, and need to be
+ * made public when installing libxf86config */
+
 /* Device.c */
 XF86ConfDevicePtr xf86parseDeviceSection(void);
 void xf86printDeviceSection(FILE *cf, XF86ConfDevicePtr ptr);
@@ -53,14 +56,14 @@ int xf86validateLayout(XF86ConfigPtr p);
 /* Module.c */
 XF86ConfModulePtr xf86parseModuleSection(void);
 void xf86printModuleSection(FILE *cf, XF86ConfModulePtr ptr);
-XF86LoadPtr xf86addNewLoadDirective(XF86LoadPtr head, char *name, int type, XF86OptionPtr opts);
+extern _X_EXPORT 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);
-void xf86freeMonitorList(XF86ConfMonitorPtr ptr);
+extern _X_EXPORT void xf86freeMonitorList(XF86ConfMonitorPtr ptr);
 void xf86freeModesList(XF86ConfModesPtr ptr);
 int xf86validateMonitor(XF86ConfigPtr p, XF86ConfScreenPtr screen);
 /* Pointer.c */
@@ -68,7 +71,7 @@ XF86ConfInputPtr xf86parsePointerSection(void);
 /* Screen.c */
 XF86ConfScreenPtr xf86parseScreenSection(void);
 void xf86printScreenSection(FILE *cf, XF86ConfScreenPtr ptr);
-void xf86freeScreenList(XF86ConfScreenPtr ptr);
+extern _X_EXPORT void xf86freeScreenList(XF86ConfScreenPtr ptr);
 void xf86freeAdaptorLinkList(XF86ConfAdaptorLinkPtr ptr);
 void xf86freeDisplayList(XF86ConfDisplayPtr ptr);
 void xf86freeModeList(XF86ModePtr ptr);