x11proto-render: Changes to 'upstream-unstable'
configure.ac | 2 +-
render.h | 8 ++++----
renderproto.h | 2 --
3 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 9c561f58b713aaecbc0ba3a6a8579094e57fdd20
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 31 14:50:09 2007 -0700
Bump version to 0.9.3.
diff --git a/configure.ac b/configure.ac
index dc3b047..cfe6a0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([RenderProto], [0.9.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RenderProto], [0.9.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
commit 030dd885476b70c9054b6e4b50dfdbab12e73716
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 31 14:28:03 2007 -0700
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.
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_ */
Reply to: