diff options
| author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-10-31 16:16:18 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@redhat.com> | 2008-10-31 17:09:13 +1030 |
| commit | f781a752e642cfe7d08f841b332c3ae507315598 (patch) | |
| tree | 63a37822ab2538f5eb1afbaff190f54d83d37895 /include | |
| parent | 245d1c162c7b13c98a9a28dc7ad441366d7e8006 (diff) | |
Move MAX_DEVICES to misc.h, rename to MAXDEVICES for consistency.
Diffstat (limited to 'include')
| -rw-r--r-- | include/inputstr.h | 4 | ||||
| -rw-r--r-- | include/misc.h | 1 | ||||
| -rw-r--r-- | include/windowstr.h | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/include/inputstr.h b/include/inputstr.h index c74a4b108..9591d2f19 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -64,9 +64,7 @@ SOFTWARE. #define SameClient(obj,client) \ (CLIENT_BITS((obj)->resource) == (client)->clientAsMask) -#define MAX_DEVICES 20 - -#define EMASKSIZE MAX_DEVICES + 1 +#define EMASKSIZE MAXDEVICES + 1 extern DevPrivateKey CoreDevicePrivateKey; diff --git a/include/misc.h b/include/misc.h index 0107a302d..3ecc9f27c 100644 --- a/include/misc.h +++ b/include/misc.h @@ -89,6 +89,7 @@ extern unsigned long serverGeneration; #define MAXCLIENTS 256 #define MAXEXTENSIONS 128 #define MAXFORMATS 8 +#define MAXDEVICES 20 /* input devices */ typedef unsigned long PIXEL; typedef unsigned long ATOM; diff --git a/include/windowstr.h b/include/windowstr.h index 13ce60bdd..9bdcadd1e 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -253,8 +253,8 @@ extern DevPrivateKey FocusPrivatesKey; * window/has focus. */ typedef struct _FocusSemaphores { - char enterleave[(MAX_DEVICES + 7)/8]; - char focusinout[(MAX_DEVICES + 7)/8]; + char enterleave[(MAXDEVICES + 7)/8]; + char focusinout[(MAXDEVICES + 7)/8]; } FocusSemaphoresRec, *FocusSemaphoresPtr; #ifdef XEVIE |