Module Name: xsrc
Committed By: mbalmer
Date: Wed Jul 8 09:04:37 UTC 2009
Modified Files:
xsrc/external/mit/xf86-input-mouse/dist/src: mouse.c mouse.h
Log Message:
Properly enclose NetBSD local changes in #ifdef __NetBSD__/#endif blocks.
ok mrg
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.6 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.7
--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.6 Wed Jul 8 00:30:52 2009
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c Wed Jul 8 09:04:37 2009
@@ -128,8 +128,9 @@
} DragLockRec, *DragLockPtr;
-
+#ifdef __NetBSD__
static const OptionInfoRec *MouseAvailableOptions(void *unused);
+#endif
static InputInfoPtr MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags);
#if 0
static void MouseUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
@@ -177,6 +178,7 @@
0
};
+#ifdef __NetBSD__
typedef enum {
OPTION_ALWAYS_CORE,
OPTION_SEND_CORE_EVENTS,
@@ -261,6 +263,7 @@
{ OPTION_SENSITIVITY, "Sensitivity", OPTV_REAL, {0}, FALSE },
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
+#endif
#define RETRY_COUNT 4
@@ -377,12 +380,14 @@
{ NULL, MSE_NONE, NULL, PROT_UNKNOWN }
};
+#ifdef __NetBSD__
/*ARGSUSED*/
static const OptionInfoRec *
MouseAvailableOptions(void *unused)
{
return (mouseOptions);
}
+#endif
/* Process options common to all mouse types. */
static void
@@ -871,6 +876,7 @@
}
}
+#ifdef __NetBSD__
_X_EXPORT const char *
xf86MouseProtocolIDToName(MouseProtocolID id)
{
@@ -882,6 +888,7 @@
{
return ProtocolNameToID(name);
}
+#endif
static int
ProtocolIDToClass(MouseProtocolID id)
@@ -3762,7 +3769,7 @@
/**************** end of autoprobe stuff *****************/
-
+#ifdef __NetBSD__
ModuleInfoRec MouseInfo = {
1,
"MOUSE",
@@ -3770,6 +3777,7 @@
0,
MouseAvailableOptions,
};
+#endif
static void
xf86MouseUnplug(pointer p)
Index: xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h:1.1.1.2 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h:1.2
--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h:1.1.1.2 Wed Jun 10 08:57:22 2009
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h Wed Jul 8 09:04:37 2009
@@ -7,7 +7,9 @@
#include "xf86OSmouse.h"
+#ifdef __NetBSD__
_X_EXPORT const char * xf86MouseProtocolIDToName(MouseProtocolID id);
MouseProtocolID xf86MouseProtocolNameToID(const char *name);
+#endif
#endif
