From 23308a251e16c4a6ab3c89c0505b0d8900c9cdff Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 25 Oct 2010 13:51:59 +1000 Subject: Rename xf86OSMouseInit to OSMouseInit. This isn't a DDX function anymore. Signed-off-by: Peter Hutterer Reviewed-by: Alan Coopersmith Tested-by: Alan Coopersmith --- src/bsd_mouse.c | 4 ++-- src/hurd_mouse.c | 2 +- src/lnx_mouse.c | 4 ++-- src/mouse.c | 2 +- src/mouse.h | 2 +- src/sun_mouse.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/bsd_mouse.c b/src/bsd_mouse.c index ea13efe..e288f38 100644 --- a/src/bsd_mouse.c +++ b/src/bsd_mouse.c @@ -768,8 +768,8 @@ bsdMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags) return TRUE; } -_X_EXPORT OSMouseInfoPtr -xf86OSMouseInit(int flags) +OSMouseInfoPtr +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..914b941 100644 --- a/src/lnx_mouse.c +++ b/src/lnx_mouse.c @@ -204,8 +204,8 @@ SetupAuto(InputInfoPtr pInfo, int *protoPara) return lnxMouseMagic(pInfo); } -_X_EXPORT OSMouseInfoPtr -xf86OSMouseInit(int flags) +OSMouseInfoPtr +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..4749f88 100644 --- a/src/sun_mouse.c +++ b/src/sun_mouse.c @@ -780,8 +780,8 @@ SupportedInterfaces(void) return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_XPS2 | MSE_MISC; } -_X_EXPORT OSMouseInfoPtr -xf86OSMouseInit(int flags) +OSMouseInfoPtr +OSMouseInit(int flags) { OSMouseInfoPtr p; -- cgit v1.2.1