summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2007-12-02 12:39:05 -0500
committerAdam Jackson <ajax@redhat.com>2007-12-02 12:40:25 -0500
commitfa47910045c3700d8d668b5e214e5ffc1e8dc3e7 (patch)
tree9d66bd4549747f815d0a75cc66a0ea7320765397 /os
parent83ba1e167c1473ac7d85239a6ee5ed629353cb16 (diff)
Clean up many #if 0.
Diffstat (limited to 'os')
-rw-r--r--os/WaitFor.c15
-rw-r--r--os/io.c5
-rw-r--r--os/osinit.c4
3 files changed, 2 insertions, 22 deletions
diff --git a/os/WaitFor.c b/os/WaitFor.c
index 7683477e6..71ca53438 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -410,21 +410,6 @@ WaitForSomething(int *pClientsReady)
return nready;
}
-#if 0
-/*
- * This is not always a macro.
- */
-ANYSET(FdMask *src)
-{
- int i;
-
- for (i=0; i<mskcnt; i++)
- if (src[ i ])
- return (TRUE);
- return (FALSE);
-}
-#endif
-
/* If time has rewound, re-run every affected timer.
* Timers might drop out of the list, so we have to restart every time. */
static void
diff --git a/os/io.c b/os/io.c
index 36abe1332..968f40a54 100644
--- a/os/io.c
+++ b/os/io.c
@@ -57,9 +57,8 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#if 0
-#define DEBUG_COMMUNICATION
-#endif
+#undef DEBUG_COMMUNICATION
+
#ifdef WIN32
#include <X11/Xwinsock.h>
#endif
diff --git a/os/osinit.c b/os/osinit.c
index 1f09f068e..1bc8624dc 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -194,10 +194,6 @@ OsInit(void)
rlim.rlim_cur = limitNoFile;
else
rlim.rlim_cur = rlim.rlim_max;
-#if 0
- if (rlim.rlim_cur > MAXSOCKS)
- rlim.rlim_cur = MAXSOCKS;
-#endif
(void)setrlimit(RLIMIT_NOFILE, &rlim);
}
}