summaryrefslogtreecommitdiff
path: root/x11.h
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-07-14 22:16:27 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2012-10-02 22:14:45 -0700
commitfdd58cacbb5b93b74ba9ba766e752b922a7c8b9c (patch)
tree67af14b803a62d554d5d4e78befda38a70c30379 /x11.h
parent9b9f7c3cacc1d220962fab1b910c6d76e2cd8087 (diff)
downloadxscope-fdd58cacbb5b93b74ba9ba766e752b922a7c8b9c.tar.gz
Convert ILong, IShort, etal to return C99 uint*_t types
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'x11.h')
-rw-r--r--x11.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/x11.h b/x11.h
index 4fba039..2a8b6bb 100644
--- a/x11.h
+++ b/x11.h
@@ -51,6 +51,8 @@
#ifndef XSCOPE_X11_H
#define XSCOPE_X11_H
+#include <inttypes.h>
+
/* Some field contents are constants, not just types */
#define CONST1(n) CARD8
@@ -531,10 +533,10 @@ extern void PrintValueRec(unsigned long key, unsigned long cmask, short ctype);
/* declaration of the types of some common functions */
-extern unsigned long ILong(const unsigned char *buf);
-extern unsigned short IShort(const unsigned char *buf);
-extern unsigned short IChar2B(const unsigned char *buf);
-extern unsigned short IByte(const unsigned char *buf);
+extern uint32_t ILong(const unsigned char *buf);
+extern uint16_t IShort(const unsigned char *buf);
+extern uint16_t IChar2B(const unsigned char *buf);
+extern uint8_t IByte(const unsigned char *buf);
extern Boolean IBool(const unsigned char *buf);
extern int PrintString8(const unsigned char *buf, int number, const char *name);