[PATCH mouse 22/23] Rename xf86OSMouseInit to OSMouseInit.

Peter Hutterer peter.hutterer at who-t.net
Sun Oct 24 23:25:30 PDT 2010


This isn't a DDX function anymore.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/bsd_mouse.c  |    2 +-
 src/hurd_mouse.c |    2 +-
 src/lnx_mouse.c  |    2 +-
 src/mouse.c      |    2 +-
 src/mouse.h      |    2 +-
 src/sun_mouse.c  |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bsd_mouse.c b/src/bsd_mouse.c
index ea13efe..81b1aa7 100644
--- a/src/bsd_mouse.c
+++ b/src/bsd_mouse.c
@@ -769,7 +769,7 @@ bsdMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags)
 }    
 
 _X_EXPORT OSMouseInfoPtr
-xf86OSMouseInit(int flags)
+OSMouseInit(int flags)
 {
     OSMouseInfoPtr p;
 
diff --git a/src/hurd_mouse.c b/src/hurd_mouse.c
index edc46f8..45b3cf2 100644
--- a/src/hurd_mouse.c
+++ b/src/hurd_mouse.c
@@ -227,7 +227,7 @@ DefaultProtocol(void)
 }
 
 OSMouseInfoPtr
-xf86OSMouseInit(int flags)
+OSMouseInit(int flags)
 {
     OSMouseInfoPtr p;
 
diff --git a/src/lnx_mouse.c b/src/lnx_mouse.c
index 7d041d2..0b2e1e0 100644
--- a/src/lnx_mouse.c
+++ b/src/lnx_mouse.c
@@ -205,7 +205,7 @@ SetupAuto(InputInfoPtr pInfo, int *protoPara)
 }
 
 _X_EXPORT OSMouseInfoPtr
-xf86OSMouseInit(int flags)
+OSMouseInit(int flags)
 {
     OSMouseInfoPtr p;
 
diff --git a/src/mouse.c b/src/mouse.c
index 0ffd1b7..19ad8bc 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -764,7 +764,7 @@ InitProtocols(void)
     if (osInfo)
 	return TRUE;
 
-    osInfo = xf86OSMouseInit(0);
+    osInfo = OSMouseInit(0);
     if (!osInfo)
 	return FALSE;
     if (!osInfo->SupportedInterfaces)
diff --git a/src/mouse.h b/src/mouse.h
index 22ec0e3..51741fc 100644
--- a/src/mouse.h
+++ b/src/mouse.h
@@ -159,7 +159,7 @@ typedef struct {
  *		failed.
  */
 
-extern OSMouseInfoPtr xf86OSMouseInit(int flags);
+extern OSMouseInfoPtr OSMouseInit(int flags);
 
 /* Z axis mapping */
 #define MSE_NOZMAP	0
diff --git a/src/sun_mouse.c b/src/sun_mouse.c
index 0d4e93b..4cd784d 100644
--- a/src/sun_mouse.c
+++ b/src/sun_mouse.c
@@ -781,7 +781,7 @@ SupportedInterfaces(void)
 }
 
 _X_EXPORT OSMouseInfoPtr
-xf86OSMouseInit(int flags)
+OSMouseInit(int flags)
 {
     OSMouseInfoPtr p;
 
-- 
1.7.2.3



More information about the xorg-devel mailing list