[cairo-commit] 2 commits - doc/public src/cairo-mutex.c
src/cairo-mutex-list.h src/cairo-mutex-list-private.h
src/cairo-mutex-private.h src/Makefile.am
Carl Worth
cworth at kemper.freedesktop.org
Thu Apr 12 13:30:06 PDT 2007
doc/public/Headers.mk | 47 ++++++++++++++++++++---------------------
doc/public/Makefile.am | 3 +-
src/Makefile.am | 2 +
src/cairo-mutex-list-private.h | 4 +--
src/cairo-mutex-private.h | 2 -
src/cairo-mutex.c | 2 -
6 files changed, 32 insertions(+), 28 deletions(-)
New commits:
diff-tree 13b0aa669fd9ce6abc930730a941782e2baba215 (from ae80d375f829b076a8d1450c54b00b3750428366)
Author: Carl Worth <cworth at cworth.org>
Date: Thu Apr 12 13:29:56 2007 -0700
Rebuild doc/public/Headers.mk
Add a sort so that future update changes will be more legible.
diff --git a/doc/public/Headers.mk b/doc/public/Headers.mk
index 3194d23..106c998 100644
--- a/doc/public/Headers.mk
+++ b/doc/public/Headers.mk
@@ -1,33 +1,34 @@
PRIVATE_TEST_HFILES = \
- cairo-meta-surface-private.h \
- cairo-truetype-subset-private.h \
- cairo-type1-private.h \
- cairo-hash-private.h \
+ cairo-analysis-surface-private.h \
+ cairo-arc-private.h \
cairo-cache-private.h \
+ cairo-clip-private.h \
+ cairo-freelist-private.h \
+ cairo-ft-private.h \
+ cairo-glitz-private.h \
+ cairo-gstate-private.h \
+ cairo-hash-private.h \
+ cairo-meta-surface-private.h \
+ cairo-mutex-list-private.h \
+ cairo-mutex-private.h \
+ cairo-os2-private.h \
cairo-output-stream-private.h \
- cairo-arc-private.h \
- cairo-xlib-test.h \
- cairo-path-private.h \
cairo-paginated-surface-private.h \
- cairo-scaled-font-test.h \
+ cairo-path-fixed-private.h \
+ cairo-path-private.h \
+ cairo-pdf-test.h \
+ cairo-private.h \
+ cairo-ps-test.h \
+ cairo-quartz-private.h \
cairo-scaled-font-subsets-private.h \
- cairo-gstate-private.h \
+ cairo-scaled-font-test.h \
cairo-skiplist-private.h \
- cairo-os2-private.h \
+ cairo-surface-fallback-private.h \
cairo-svg-test.h \
- cairo-freelist-private.h \
- cairo-glitz-private.h \
- cairo-ps-test.h \
- cairo-quartz-private.h \
+ cairo-truetype-subset-private.h \
+ cairo-type1-private.h \
cairo-wideint-private.h \
- cairo-mutex-private.h \
- cairo-path-fixed-private.h \
- cairo-private.h \
- cairo-ft-private.h \
- cairo-xlib-private.h \
- cairo-clip-private.h \
- cairo-pdf-test.h \
cairo-win32-private.h \
- cairo-analysis-surface-private.h \
- cairo-surface-fallback-private.h \
+ cairo-xlib-private.h \
+ cairo-xlib-test.h \
cairoint.h
diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am
index a9a6729..44fc6c2 100644
--- a/doc/public/Makefile.am
+++ b/doc/public/Makefile.am
@@ -40,7 +40,8 @@ Headers.mk:
find $(top_srcdir)/src \
-name '*-private.h' -o \
-name '*-test.h' | \
- sed 's at .*/@ @; s@$$@ \\@'; \
+ sed 's at .*/@ @; s@$$@ \\@' | \
+ LANG=C sort; \
echo ' cairoint.h' ) > $@.tmp
mv $@.tmp $@
diff-tree ae80d375f829b076a8d1450c54b00b3750428366 (from 29adf591b7026092a809e9a27878b5b4e35051fb)
Author: Carl Worth <cworth at cworth.org>
Date: Thu Apr 12 13:02:26 2007 -0700
Rename cairo-mutex-list.h to cairo-mutex-list-private.h
Also add it (and cairo-mutex-private.h) to Makefile.am
where they should have been.
diff --git a/src/Makefile.am b/src/Makefile.am
index c936984..36d84fb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -188,6 +188,8 @@ libcairo_la_SOURCES = \
cairo-lzw.c \
cairo-matrix.c \
cairo-mutex.c \
+ cairo-mutex-list-private.h \
+ cairo-mutex-private.h \
cairo-operator.c \
cairo-path.c \
cairo-path-private.h \
diff --git a/src/cairo-mutex-list-private.h b/src/cairo-mutex-list-private.h
new file mode 100644
index 0000000..7d6086a
--- /dev/null
+++ b/src/cairo-mutex-list-private.h
@@ -0,0 +1,50 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2007 Mathias Hasselmann
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * Contributor(s):
+ * Mathias Hasselmann <mathias.hasselmann at gmx.de>
+ */
+
+#ifndef CAIRO_MUTEX_LIST_PRIVATE_H
+#define CAIRO_MUTEX_LIST_PRIVATE_H
+
+CAIRO_MUTEX_DECLARE (_cairo_pattern_solid_cache_lock);
+
+CAIRO_MUTEX_DECLARE (_cairo_font_face_mutex);
+CAIRO_MUTEX_DECLARE (_cairo_scaled_font_map_mutex);
+
+#if CAIRO_HAS_FT_FONT
+CAIRO_MUTEX_DECLARE (_cairo_ft_unscaled_font_map_mutex);
+#endif
+
+#if CAIRO_HAS_XLIB_SURFACE
+CAIRO_MUTEX_DECLARE (_cairo_xlib_screen_mutex);
+#endif
+
+#endif
diff --git a/src/cairo-mutex-list.h b/src/cairo-mutex-list.h
deleted file mode 100644
index c054e11..0000000
--- a/src/cairo-mutex-list.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2007 Mathias Hasselmann
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * Contributor(s):
- * Mathias Hasselmann <mathias.hasselmann at gmx.de>
- */
-
-#ifndef CAIRO_MUTEX_LIST_H
-#define CAIRO_MUTEX_LIST_H
-
-CAIRO_MUTEX_DECLARE (_cairo_pattern_solid_cache_lock);
-
-CAIRO_MUTEX_DECLARE (_cairo_font_face_mutex);
-CAIRO_MUTEX_DECLARE (_cairo_scaled_font_map_mutex);
-
-#if CAIRO_HAS_FT_FONT
-CAIRO_MUTEX_DECLARE (_cairo_ft_unscaled_font_map_mutex);
-#endif
-
-#if CAIRO_HAS_XLIB_SURFACE
-CAIRO_MUTEX_DECLARE (_cairo_xlib_screen_mutex);
-#endif
-
-#endif
diff --git a/src/cairo-mutex-private.h b/src/cairo-mutex-private.h
index 8375ed5..80f5644 100644
--- a/src/cairo-mutex-private.h
+++ b/src/cairo-mutex-private.h
@@ -131,7 +131,7 @@ CAIRO_BEGIN_DECLS
#define CAIRO_MUTEX_DECLARE(name) extern cairo_mutex_t name;
#endif
-#include "cairo-mutex-list.h"
+#include "cairo-mutex-list-private.h"
#undef CAIRO_MUTEX_DECLARE
#undef CAIRO_MUTEX_EXTERNAL
diff --git a/src/cairo-mutex.c b/src/cairo-mutex.c
index 613d2c8..2b0f537 100644
--- a/src/cairo-mutex.c
+++ b/src/cairo-mutex.c
@@ -46,7 +46,7 @@ void _cairo_mutex_initialize (void)
return;
#define CAIRO_MUTEX_DECLARE(mutex) CAIRO_MUTEX_INIT (mutex);
-#include "cairo-mutex-list.h"
+#include "cairo-mutex-list-private.h"
#undef CAIRO_MUTEX_DECLARE
}
More information about the cairo-commit
mailing list