Annotation of /trunk/inputproto/patches/inputproto-1.4.3-xdm.h-int32-fix.patch
Parent Directory | Revision Log
Revision 553 -
(hide annotations)
(download)
Thu Mar 27 14:43:12 2008 UTC (16 years, 6 months ago) by niro
File size: 1884 byte(s)
Thu Mar 27 14:43:12 2008 UTC (16 years, 6 months ago) by niro
File size: 1884 byte(s)
-fixes qt3 build issues
1 | niro | 553 | From b5cbe2d93f6c0129b8f29da97778f6d1b15c38f9 Mon Sep 17 00:00:00 2001 |
2 | From: Adam Jackson <ajax@redhat.com> | ||
3 | Date: Mon, 10 Mar 2008 13:08:21 +0000 | ||
4 | Subject: C sucks: define XEventClass in terms of unsigned int, not CARD32. | ||
5 | |||
6 | Apparently pulling in Xmd.h here breaks qt, since they both define an | ||
7 | INT32 type (and incompatible ones even, since Xmd's is unsigned long on | ||
8 | ILP32 because whoever wrote Xmd.h is a C novice). | ||
9 | --- | ||
10 | diff --git a/XI.h b/XI.h | ||
11 | index fe4981a..ec9bee2 100644 | ||
12 | --- a/XI.h | ||
13 | +++ b/XI.h | ||
14 | @@ -1,5 +1,3 @@ | ||
15 | -/* $Xorg: XI.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ | ||
16 | - | ||
17 | /************************************************************ | ||
18 | |||
19 | Copyright 1989, 1998 The Open Group | ||
20 | @@ -45,17 +43,12 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS | ||
21 | SOFTWARE. | ||
22 | |||
23 | ********************************************************/ | ||
24 | -/* $XFree86: xc/include/extensions/XI.h,v 1.4 2001/01/17 17:53:16 dawes Exp $ */ | ||
25 | |||
26 | /* Definitions used by the server, library and client */ | ||
27 | |||
28 | #ifndef _XI_H_ | ||
29 | #define _XI_H_ | ||
30 | |||
31 | -#include <X11/Xmd.h> /* CARD32 */ | ||
32 | - | ||
33 | -#define sz_xGetExtensionVersionReq 8 | ||
34 | -#define sz_xGetExtensionVersionReply 32 | ||
35 | #define sz_xListInputDevicesReq 4 | ||
36 | #define sz_xListInputDevicesReply 32 | ||
37 | #define sz_xOpenDeviceReq 8 | ||
38 | @@ -263,12 +256,16 @@ SOFTWARE. | ||
39 | #define XI_DeviceBusy 3 | ||
40 | #define XI_BadClass 4 | ||
41 | |||
42 | -/* Make XEventClass be a CARD32 for 64 bit servers. Don't affect client | ||
43 | +/* | ||
44 | + * Make XEventClass be a CARD32 for 64 bit servers. Don't affect client | ||
45 | * definition of XEventClass since that would be a library interface change. | ||
46 | * See the top of X.h for more _XSERVER64 magic. | ||
47 | + * | ||
48 | + * But, don't actually use the CARD32 type. We can't get it defined here | ||
49 | + * without polluting the namespace. | ||
50 | */ | ||
51 | #ifdef _XSERVER64 | ||
52 | -typedef CARD32 XEventClass; | ||
53 | +typedef unsigned int XEventClass; | ||
54 | #else | ||
55 | typedef unsigned long XEventClass; | ||
56 | #endif | ||
57 | -- | ||
58 | cgit v0.7.2-37-g538c |