Remove some #if 1 statements

2 files changed, 3 insertions, 8 deletions

diff --git a/src/mouse.c b/src/mouse.c
index 5e52dd0..3f0eb86 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1190,12 +1190,11 @@ MouseReadInput(InputInfoPtr pInfo)
 	ErrorF("mouse byte: %2.2x\n",u);
 #endif
 
-#if 1
 	/* if we do autoprobing collect the data */
 	if (pMse->collectData && pMse->autoProbe)
 	    if (pMse->collectData(pMse,u))
 		continue;
-#endif
+
 #ifdef SUPPORT_MOUSE_RESET
 	if (mouseReset(pInfo,u)) {
 	    pBufP = 0;
@@ -3675,10 +3674,10 @@ checkForErraticMovements(InputInfoPtr pInfo, int dx, int dy)
 {
     MouseDevPtr pMse = pInfo->private;
     mousePrivPtr mPriv = (mousePrivPtr)pMse->mousePriv;
-#if 1
+
     if (!mPriv->goodCount)
 	return;
-#endif
+
 #if 0
     if (abs(dx - mPriv->prevDx) > 300 
 	|| abs(dy - mPriv->prevDy) > 300)
diff --git a/src/pnp.c b/src/pnp.c
index a45cb52..0e95ac3 100644
--- a/src/pnp.c
+++ b/src/pnp.c
@@ -187,7 +187,6 @@ MouseGetPnpProtocol(InputInfoPtr pInfo)
 	    return val;
     }
 
-#if 1
     last = mPriv->pnpLast;
     mPriv->pnpLast = currentTime.milliseconds;
 
@@ -213,9 +212,6 @@ MouseGetPnpProtocol(InputInfoPtr pInfo)
 	return getPs2ProtocolPnP(pInfo);
     else
 	return probePs2ProtocolPnP(pInfo);
-#else
-    return PROT_UNKNOWN;
-#endif
 }
 
 /*