summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-08-31 14:28:03 -0700
committerEric Anholt <eric@anholt.net>2007-08-31 14:42:43 -0700
commit030dd885476b70c9054b6e4b50dfdbab12e73716 (patch)
tree88751da71935c2fa69f717ef63404202045407e4
parent76a3e69e8e5a761533fc4c752bf907c2440ea6b2 (diff)
downloadxorg-proto-renderproto-030dd885476b70c9054b6e4b50dfdbab12e73716.tar.gz
Bug #7364: Fix the typedefs of GlyphSet, Picture, and PictFormat to be XIDs.
Without this, they would be 64-bit types on 64-bit X Servers, which occasionally resulted in incorrect unpacking.
-rw-r--r--render.h8
-rw-r--r--renderproto.h2
2 files changed, 4 insertions, 6 deletions
diff --git a/render.h b/render.h
index 691c63f..497af6d 100644
--- a/render.h
+++ b/render.h
@@ -26,10 +26,10 @@
#ifndef _RENDER_H_
#define _RENDER_H_
-typedef unsigned long Glyph;
-typedef unsigned long GlyphSet;
-typedef unsigned long Picture;
-typedef unsigned long PictFormat;
+typedef XID Glyph;
+typedef XID GlyphSet;
+typedef XID Picture;
+typedef XID PictFormat;
#define RENDER_NAME "RENDER"
#define RENDER_MAJOR 0
diff --git a/renderproto.h b/renderproto.h
index bdd4c74..ffe0639 100644
--- a/renderproto.h
+++ b/renderproto.h
@@ -46,7 +46,6 @@
#define PictFormat CARD32
#define Fixed INT32
#define Glyphset CARD32
-#define Glyph CARD32
/*
* data structures
@@ -660,6 +659,5 @@ typedef struct {
#undef PictFormat
#undef Fixed
#undef Glyphset
-#undef Glyph
#endif /* _XRENDERP_H_ */