projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The Great XCB Renaming
[free-sw/xcb/libxcb]
/
src
/
xcb_xid.c
diff --git
a/src/xcb_xid.c
b/src/xcb_xid.c
index
a2e7dec
..
6ca6bd9
100644
(file)
--- a/
src/xcb_xid.c
+++ b/
src/xcb_xid.c
@@
-33,16
+33,16
@@
/* Public interface */
/* Public interface */
-
CARD32 XCBGenerateID(XCBConnection
*c)
+
uint32_t xcb_generate_id(xcb_connection_t
*c)
{
{
-
CARD32
ret;
+
uint32_t
ret;
if(c->has_error)
return -1;
pthread_mutex_lock(&c->xid.lock);
if(c->xid.last == c->xid.max)
{
if(c->has_error)
return -1;
pthread_mutex_lock(&c->xid.lock);
if(c->xid.last == c->xid.max)
{
-
XCBXCMiscGetXIDRangeRep
*range;
- range =
XCBXCMiscGetXIDRangeReply(c, XCBXCMiscGetXIDR
ange(c), 0);
+
xcb_xc_misc_get_xid_range_reply_t
*range;
+ range =
xcb_xc_misc_get_xid_range_reply(c, xcb_xc_misc_get_xid_r
ange(c), 0);
if(!range)
{
pthread_mutex_unlock(&c->xid.lock);
if(!range)
{
pthread_mutex_unlock(&c->xid.lock);
@@
-60,7
+60,7
@@
CARD32 XCBGenerateID(XCBConnection *c)
/* Private interface */
/* Private interface */
-int _xcb_xid_init(
XCBConnection
*c)
+int _xcb_xid_init(
xcb_connection_t
*c)
{
if(pthread_mutex_init(&c->xid.lock, 0))
return 0;
{
if(pthread_mutex_init(&c->xid.lock, 0))
return 0;
@@
-71,7
+71,7
@@
int _xcb_xid_init(XCBConnection *c)
return 1;
}
return 1;
}
-void _xcb_xid_destroy(
XCBConnection
*c)
+void _xcb_xid_destroy(
xcb_connection_t
*c)
{
pthread_mutex_destroy(&c->xid.lock);
}
{
pthread_mutex_destroy(&c->xid.lock);
}