diff options
| author | James Cloos <cloos@jhcloos.com> | 2007-09-03 06:17:59 -0400 |
|---|---|---|
| committer | James Cloos <cloos@jhcloos.com> | 2007-09-03 06:17:59 -0400 |
| commit | 192cdc7530b8ff45d9bcea99dc07849ffbfa65b7 (patch) | |
| tree | 5224999532b54e6cf71c0296a6c4d2949feb8a04 | |
| parent | 67b12440358eec012023d46e9150ca22c6fd47bf (diff) | |
| parent | 9c561f58b713aaecbc0ba3a6a8579094e57fdd20 (diff) | |
| download | xorg-proto-renderproto-192cdc7530b8ff45d9bcea99dc07849ffbfa65b7.tar.gz | |
Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/proto/renderproto
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | render.h | 8 | ||||
| -rw-r--r-- | renderproto.h | 2 |
3 files changed, 5 insertions, 7 deletions
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 @@ -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_ */ |