diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2023-09-08 05:40:11 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2023-09-08 05:40:11 +0000 |
commit | 8dd2b5ebf315fa54dbaff11742c3ed2beaeaff0b (patch) | |
tree | 6940201a54e29d7871495a9f0f776e1901100081 /proto | |
parent | eb63c9dae774a6f7f0fd1534035b61b9a54a594e (diff) |
Revert previous. Needs more thinking. suggested by kettenis@
Diffstat (limited to 'proto')
-rw-r--r-- | proto/xorgproto/include/X11/Xmd.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/proto/xorgproto/include/X11/Xmd.h b/proto/xorgproto/include/X11/Xmd.h index c84ea66f5..68c45dbec 100644 --- a/proto/xorgproto/include/X11/Xmd.h +++ b/proto/xorgproto/include/X11/Xmd.h @@ -57,8 +57,6 @@ SOFTWARE. # include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */ # endif -#include <stdint.h> - #if defined(__SIZEOF_LONG__) # if __SIZEOF_LONG__ == 8 # define LONG64 /* 32/64-bit architecture */ @@ -109,10 +107,15 @@ typedef short INT16; typedef signed char INT8; -typedef uint64_t CARD64; -typedef uint32_t CARD32; -typedef uint16_t CARD16; -typedef uint8_t CARD8; +# ifdef LONG64 +typedef unsigned long CARD64; +typedef unsigned int CARD32; +# else +typedef unsigned long long CARD64; +typedef unsigned long CARD32; +# endif +typedef unsigned short CARD16; +typedef unsigned char CARD8; typedef CARD32 BITS32; typedef CARD16 BITS16; |