diff options
author | Adam Jackson <ajax@redhat.com> | 2011-06-17 14:17:09 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2012-01-06 13:29:53 -0500 |
commit | c44ef2e1ff7bad168c348da63477b4636b3054fd (patch) | |
tree | b305ec3395535a8cb08f6b54767c543440b35c91 | |
parent | 48e7a2ef574c8b38c4f8f07b45f54c8bfd02552b (diff) |
os: Minor header cleanup
Move some constants near their only users, and remove some
getdtablesize() logic that's second-guessing configure.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r-- | os/connection.c | 2 | ||||
-rw-r--r-- | os/io.c | 2 | ||||
-rw-r--r-- | os/osdep.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/os/connection.c b/os/connection.c index 0f1f87925..2c90d72a9 100644 --- a/os/connection.c +++ b/os/connection.c @@ -873,6 +873,8 @@ EstablishNewConnections(ClientPtr clientUnused, pointer closure) * Fail a connection due to lack of client or file descriptor space ************/ +#define BOTIMEOUT 200 /* in milliseconds */ + static void ErrorConnMax(XtransConnInfo trans_conn) { @@ -129,6 +129,8 @@ static OsCommPtr AvailableInput = (OsCommPtr)NULL; ((xBigReq *)(req))->length) #define MAX_TIMES_PER 10 +#define BUFSIZE 4096 +#define BUFWATERMARK 8192 /* * A lot of the code in this file manipulates a ConnectionInputPtr: diff --git a/os/osdep.h b/os/osdep.h index 9b9dda958..c9add48ee 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -52,10 +52,6 @@ SOFTWARE. #ifndef _OSDEP_H_ #define _OSDEP_H_ 1 -#define BOTIMEOUT 200 /* in milliseconds */ -#define BUFSIZE 4096 -#define BUFWATERMARK 8192 - #if defined(XDMCP) || defined(HASXDMAUTH) #include <X11/Xdmcp.h> #endif |