xserver: Branch 'master'

[Paulo Cesar Pereira de Andrade]

 hw/xfree86/modes/xf86Crtc.c |    2 +-
 hw/xfree86/modes/xf86Crtc.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 091a50d1260c70055aba1fa6a2d1b1a36de1114e
Author: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
Date:   Thu Dec 4 18:23:25 2008 -0200

    Move _X_EXPORT attribute to header file.
    
      The attribute should be set on header files to make it easier to
    manage what symbols are available to modules.
      _X_EXPORT should be used in sources only for special cases, like
    symbols that must be visible by non video/input driver/modules but
    should not be "advertised" in the sdk.

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index be01992..50ed158 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -427,7 +427,7 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
 /**
  * Pans the screen, does not change the mode
  */
-_X_EXPORT void
+void
 xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y)
 {
     crtc->x = x;
diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index 2953241..1236742 100644
--- a/hw/xfree86/modes/xf86Crtc.h
+++ b/hw/xfree86/modes/xf86Crtc.h
@@ -694,7 +694,7 @@ extern _X_EXPORT Bool
 xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
 		 int x, int y);
 
-void
+extern _X_EXPORT void
 xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);
 
 /*