aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xorg-server/include/misc.h2
-rw-r--r--xorg-server/include/resource.h3
-rw-r--r--xorg-server/os/connection.c4
3 files changed, 6 insertions, 3 deletions
diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h
index 8f986d988..aa5d2fde8 100644
--- a/xorg-server/include/misc.h
+++ b/xorg-server/include/misc.h
@@ -93,7 +93,7 @@ static double __inline trunc(double d)
#ifndef MAXSCREENS
#define MAXSCREENS 16
#endif
-#define MAXCLIENTS 256
+#define MAXCLIENTS 1024
#define MAXEXTENSIONS 128
#define MAXFORMATS 8
#define MAXDEVICES 40 /* input devices */
diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h
index 224e9bb18..02db6d80a 100644
--- a/xorg-server/include/resource.h
+++ b/xorg-server/include/resource.h
@@ -99,6 +99,9 @@ typedef uint32_t RESTYPE;
#if MAXCLIENTS == 512
#define RESOURCE_CLIENT_BITS 9
#endif
+#if MAXCLIENTS == 1024
+#define RESOURCE_CLIENT_BITS 10
+#endif
/* client field offset */
#define CLIENTOFFSET (RESOURCE_AND_CLIENT_COUNT - RESOURCE_CLIENT_BITS)
/* resource field */
diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c
index e9b633523..ddda86a79 100644
--- a/xorg-server/os/connection.c
+++ b/xorg-server/os/connection.c
@@ -176,9 +176,9 @@ int *ConnectionTranslation = NULL;
*/
#undef MAXSOCKS
-#define MAXSOCKS 500
+#define MAXSOCKS FD_SETSIZE
#undef MAXSELECT
-#define MAXSELECT 500
+#define MAXSELECT FD_SETSIZE
struct _ct_node {
struct _ct_node *next;