[cairo-commit] 2 commits - configure.in doc/public src/cairo.h
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:16:25 PDT 2007
configure.in | 11 ----------
doc/public/Headers.mk | 45 ++++++++++++++++++++---------------------
src/Makefile.am | 2 +
src/cairo-mutex-list-private.h | 4 +--
src/cairo-mutex-private.h | 2 -
src/cairo-mutex.c | 2 -
src/cairo.h | 40 ++++++++++++++++++------------------
7 files changed, 49 insertions(+), 57 deletions(-)
New commits:
diff-tree 7383bcab169e293518fbd58b749fb0d7d4bd285e (from bcaa87443d7da1d816d5c895c6ac148030b05b3f)
Author: Carl Worth <cworth at cworth.org>
Date: Thu Apr 12 13:16:27 2007 -0700
Add missing piece of the cairo-mutex-list-private.h rename
With apologies for the temporary break in the build.
diff --git a/configure.in b/configure.in
index a045699..0672614 100644
--- a/configure.in
+++ b/configure.in
@@ -866,20 +866,9 @@ AC_CONFIG_COMMANDS([src/cairo-features.h
# define CAIRO_END_DECLS
#endif
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
-/* only enable warnings if they can be suppressed (-Wno-attributes) */
-#define CAIRO_WARN_UNUSED_RESULT \
- __attribute__((__warn_unused_result__))
-#else
-#define CAIRO_WARN_UNUSED_RESULT
-#endif /* __GNUC__ */
-
#ifndef cairo_public
# define cairo_public
#endif
-#ifndef cairo_public_warn
-# define cairo_public_warn cairo_public CAIRO_WARN_UNUSED_RESULT
-#endif
#define CAIRO_VERSION_MAJOR $CAIRO_VERSION_MAJOR
#define CAIRO_VERSION_MINOR $CAIRO_VERSION_MINOR
diff --git a/doc/public/Headers.mk b/doc/public/Headers.mk
index 3194d23..b8ee8bb 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-cache-private.h \
- cairo-output-stream-private.h \
cairo-arc-private.h \
+ cairo-ft-private.h \
+ cairo-gstate-private.h \
+ cairo-path-fixed-private.h \
+ cairo-private.h \
+ cairo-quartz-private.h \
+ cairo-clip-private.h \
+ cairo-win32-private.h \
cairo-xlib-test.h \
+ cairo-analysis-surface-private.h \
+ cairo-cache-private.h \
+ cairo-output-stream-private.h \
cairo-path-private.h \
+ cairo-hash-private.h \
+ cairo-meta-surface-private.h \
+ cairo-scaled-font-subsets-private.h \
+ cairo-surface-fallback-private.h \
cairo-paginated-surface-private.h \
+ cairo-pdf-test.h \
+ cairo-ps-test.h \
+ cairo-wideint-private.h \
+ cairo-truetype-subset-private.h \
+ cairo-xlib-private.h \
cairo-scaled-font-test.h \
- cairo-scaled-font-subsets-private.h \
- cairo-gstate-private.h \
- cairo-skiplist-private.h \
- cairo-os2-private.h \
cairo-svg-test.h \
+ cairo-skiplist-private.h \
+ cairo-mutex-list-private.h \
cairo-freelist-private.h \
cairo-glitz-private.h \
- cairo-ps-test.h \
- cairo-quartz-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-os2-private.h \
+ cairo-type1-private.h \
cairoint.h
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.h b/src/cairo.h
index 5fc05e3..a80efde 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -313,7 +313,7 @@ cairo_public void *
cairo_get_user_data (cairo_t *cr,
const cairo_user_data_key_t *key);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_set_user_data (cairo_t *cr,
const cairo_user_data_key_t *key,
void *user_data,
@@ -972,7 +972,7 @@ cairo_font_options_copy (const cairo_fon
cairo_public void
cairo_font_options_destroy (cairo_font_options_t *options);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_font_options_status (cairo_font_options_t *options);
cairo_public void
@@ -1088,7 +1088,7 @@ cairo_font_face_destroy (cairo_font_face
cairo_public unsigned int
cairo_font_face_get_reference_count (cairo_font_face_t *font_face);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_font_face_status (cairo_font_face_t *font_face);
/**
@@ -1141,7 +1141,7 @@ cairo_public void *
cairo_font_face_get_user_data (cairo_font_face_t *font_face,
const cairo_user_data_key_t *key);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_font_face_set_user_data (cairo_font_face_t *font_face,
const cairo_user_data_key_t *key,
void *user_data,
@@ -1164,7 +1164,7 @@ cairo_scaled_font_destroy (cairo_scaled_
cairo_public unsigned int
cairo_scaled_font_get_reference_count (cairo_scaled_font_t *scaled_font);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_scaled_font_status (cairo_scaled_font_t *scaled_font);
cairo_public cairo_font_type_t
@@ -1174,7 +1174,7 @@ cairo_public void *
cairo_scaled_font_get_user_data (cairo_scaled_font_t *scaled_font,
const cairo_user_data_key_t *key);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_scaled_font_set_user_data (cairo_scaled_font_t *scaled_font,
const cairo_user_data_key_t *key,
void *user_data,
@@ -1392,7 +1392,7 @@ cairo_path_destroy (cairo_path_t *path);
/* Error status queries */
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_status (cairo_t *cr);
cairo_public const char *
@@ -1418,7 +1418,7 @@ cairo_surface_destroy (cairo_surface_t *
cairo_public unsigned int
cairo_surface_get_reference_count (cairo_surface_t *surface);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_surface_status (cairo_surface_t *surface);
/**
@@ -1482,11 +1482,11 @@ cairo_surface_get_content (cairo_surface
#if CAIRO_HAS_PNG_FUNCTIONS
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_surface_write_to_png (cairo_surface_t *surface,
const char *filename);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_surface_write_to_png_stream (cairo_surface_t *surface,
cairo_write_func_t write_func,
void *closure);
@@ -1497,7 +1497,7 @@ cairo_public void *
cairo_surface_get_user_data (cairo_surface_t *surface,
const cairo_user_data_key_t *key);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_surface_set_user_data (cairo_surface_t *surface,
const cairo_user_data_key_t *key,
void *user_data,
@@ -1642,14 +1642,14 @@ cairo_pattern_destroy (cairo_pattern_t *
cairo_public unsigned int
cairo_pattern_get_reference_count (cairo_pattern_t *pattern);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_pattern_status (cairo_pattern_t *pattern);
cairo_public void *
cairo_pattern_get_user_data (cairo_pattern_t *pattern,
const cairo_user_data_key_t *key);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_pattern_set_user_data (cairo_pattern_t *pattern,
const cairo_user_data_key_t *key,
void *user_data,
@@ -1758,32 +1758,32 @@ cairo_pattern_set_filter (cairo_pattern_
cairo_public cairo_filter_t
cairo_pattern_get_filter (cairo_pattern_t *pattern);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_pattern_get_rgba (cairo_pattern_t *pattern,
double *red, double *green,
double *blue, double *alpha);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_pattern_get_surface (cairo_pattern_t *pattern,
cairo_surface_t **surface);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_pattern_get_color_stop_rgba (cairo_pattern_t *pattern,
int index, double *offset,
double *red, double *green,
double *blue, double *alpha);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_pattern_get_color_stop_count (cairo_pattern_t *pattern,
int *count);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_pattern_get_linear_points (cairo_pattern_t *pattern,
double *x0, double *y0,
double *x1, double *y1);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_pattern_get_radial_circles (cairo_pattern_t *pattern,
double *x0, double *y0, double *r0,
double *x1, double *y1, double *r1);
@@ -1820,7 +1820,7 @@ cairo_matrix_scale (cairo_matrix_t *matr
cairo_public void
cairo_matrix_rotate (cairo_matrix_t *matrix, double radians);
-cairo_public_warn cairo_status_t
+cairo_public cairo_status_t
cairo_matrix_invert (cairo_matrix_t *matrix);
cairo_public void
diff-tree bcaa87443d7da1d816d5c895c6ac148030b05b3f (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.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