[cairo-commit] src/cairo-mutex-list.h src/cairo-xlib-screen.c

[Behdad Esfahbod]

 src/cairo-mutex-list.h  |    2 +-
 src/cairo-xlib-screen.c |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
diff-tree d3177a68752ac2c8d20b1a8a3616298f04f31078 (from be52178443ffd19fc7848dfc78c477883ccb943b)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Mar 20 07:59:47 2007 -0400

    [cairo-mutex] Rename _xlib_screen_mutex to _cairo_xlib_screen_mutex

diff --git a/src/cairo-mutex-list.h b/src/cairo-mutex-list.h
index c624242..0e1606a 100644
--- a/src/cairo-mutex-list.h
+++ b/src/cairo-mutex-list.h
@@ -42,7 +42,7 @@ CAIRO_MUTEX_DECLARE (_cairo_ft_unscaled_
 #endif
 
 #if CAIRO_HAS_XLIB_SURFACE
-CAIRO_MUTEX_DECLARE (_xlib_screen_mutex);
+CAIRO_MUTEX_DECLARE (_cairo_xlib_screen_mutex);
 #endif
 
 #if CAIRO_HAS_OS2_SURFACE
diff --git a/src/cairo-xlib-screen.c b/src/cairo-xlib-screen.c
index 5e5cad4..3ecbb77 100644
--- a/src/cairo-xlib-screen.c
+++ b/src/cairo-xlib-screen.c
@@ -254,7 +254,7 @@ _cairo_xlib_close_display (Display *dpy,
     /*
      * 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) {
@@ -276,7 +276,7 @@ _cairo_xlib_close_display (Display *dpy,
 	}
     }
     *prev = NULL;
-    CAIRO_MUTEX_UNLOCK (_xlib_screen_mutex);
+    CAIRO_MUTEX_UNLOCK (_cairo_xlib_screen_mutex);
 
     /* Return value in accordance with requirements of
      * XESetCloseDisplay */
@@ -291,7 +291,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;
@@ -305,7 +305,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);
 
 }
 
@@ -379,11 +379,11 @@ _cairo_xlib_screen_info_get (Display *dp
      * 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;
 }
@@ -396,7 +396,7 @@ _cairo_xlib_add_close_display_hook (Disp
     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)
@@ -430,7 +430,7 @@ _cairo_xlib_add_close_display_hook (Disp
 
     success = TRUE;
  unlock:
-    CAIRO_MUTEX_UNLOCK (_xlib_screen_mutex);
+    CAIRO_MUTEX_UNLOCK (_cairo_xlib_screen_mutex);
     return success;
 }
 
@@ -441,7 +441,7 @@ _cairo_xlib_remove_close_display_hook (D
     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)
@@ -457,7 +457,7 @@ _cairo_xlib_remove_close_display_hook (D
     }
 
 unlock:
-    CAIRO_MUTEX_UNLOCK (_xlib_screen_mutex);
+    CAIRO_MUTEX_UNLOCK (_cairo_xlib_screen_mutex);
 }
 
 void