fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-04-21 11:10:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git+ssh://hasselmm@git.freedesktop.org/git/cairo

Browse source
This commit is contained in:
Mathias Hasselmann 2007-03-20 13:33:50 +01:00
commit 94c367f7d7
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cairo-mutex-list.h
View file

@ -42,7 +42,7 @@ CAIRO_MUTEX_DECLARE (_cairo_ft_unscaled_font_map_mutex);
#endif
#if CAIRO_HAS_XLIB_SURFACE
CAIRO_MUTEX_DECLARE (_xlib_screen_mutex);
CAIRO_MUTEX_DECLARE (_cairo_xlib_screen_mutex);
#endif
#endif

20
src/cairo-xlib-screen.c
View file

@ -253,7 +253,7 @@ _cairo_xlib_close_display (Display *dpy, XExtCodes *codes)
/*
* Unhook from the global list
*/
CAIRO_MUTEX_LOCK (_xlib_screen_mutex);
CAIRO_MUTEX_LOCK (_cairo_xlib_screen_mutex);
prev = &_cairo_xlib_screen_list;
for (info = _cairo_xlib_screen_list; info; info = next) {
@ -275,7 +275,7 @@ _cairo_xlib_close_display (Display *dpy, XExtCodes *codes)
}
}
*prev = NULL;
CAIRO_MUTEX_UNLOCK (_xlib_screen_mutex);
CAIRO_MUTEX_UNLOCK (_cairo_xlib_screen_mutex);
/* Return value in accordance with requirements of
* XESetCloseDisplay */
@ -290,7 +290,7 @@ _cairo_xlib_screen_info_reset (void)
/*
* Delete everything in the list.
*/
CAIRO_MUTEX_LOCK (_xlib_screen_mutex);
CAIRO_MUTEX_LOCK (_cairo_xlib_screen_mutex);
for (info = _cairo_xlib_screen_list; info; info = next) {
next = info->next;
@ -304,7 +304,7 @@ _cairo_xlib_screen_info_reset (void)
_cairo_xlib_screen_list = NULL;
CAIRO_MUTEX_UNLOCK (_xlib_screen_mutex);
CAIRO_MUTEX_UNLOCK (_cairo_xlib_screen_mutex);
}
@ -378,11 +378,11 @@ _cairo_xlib_screen_info_get (Display *dpy, Screen *screen)
* app, and the CloseDisplay hook is the only other place we
* acquire this mutex.
*/
CAIRO_MUTEX_LOCK (_xlib_screen_mutex);
CAIRO_MUTEX_LOCK (_cairo_xlib_screen_mutex);
info = _cairo_xlib_screen_info_get_unlocked (dpy, screen);
CAIRO_MUTEX_UNLOCK (_xlib_screen_mutex);
CAIRO_MUTEX_UNLOCK (_cairo_xlib_screen_mutex);
return info;
}
@ -395,7 +395,7 @@ _cairo_xlib_add_close_display_hook (Display *dpy, void (*func) (Display *, void
cairo_xlib_hook_t **prev;
cairo_bool_t success = FALSE;
CAIRO_MUTEX_LOCK (_xlib_screen_mutex);
CAIRO_MUTEX_LOCK (_cairo_xlib_screen_mutex);
info = _cairo_xlib_screen_info_get_unlocked (dpy, NULL);
if (!info)
@ -429,7 +429,7 @@ _cairo_xlib_add_close_display_hook (Display *dpy, void (*func) (Display *, void
success = TRUE;
unlock:
CAIRO_MUTEX_UNLOCK (_xlib_screen_mutex);
CAIRO_MUTEX_UNLOCK (_cairo_xlib_screen_mutex);
return success;
}
@ -440,7 +440,7 @@ _cairo_xlib_remove_close_display_hook (Display *dpy, void *key)
cairo_xlib_hook_t *hook;
cairo_xlib_hook_t **prev;
CAIRO_MUTEX_LOCK (_xlib_screen_mutex);
CAIRO_MUTEX_LOCK (_cairo_xlib_screen_mutex);
info = _cairo_xlib_screen_info_get_unlocked (dpy, NULL);
if (!info)
@ -456,7 +456,7 @@ _cairo_xlib_remove_close_display_hook (Display *dpy, void *key)
}
unlock:
CAIRO_MUTEX_UNLOCK (_xlib_screen_mutex);
CAIRO_MUTEX_UNLOCK (_cairo_xlib_screen_mutex);
}
void