[cairo-commit] 2 commits - src/cairo-cff-subset.c src/cairo-font-face.c src/cairo-ft-font.c src/cairoint.h src/cairo-output-stream.c src/cairo-pdf-surface.c src/cairo-ps-surface.c src/cairo-scaled-font-subsets.c src/cairo-svg-surface.c src/cairo-truetype-subset.c src/cairo-type1-fallback.c src/cairo-type1-subset.c

Chris Wilson ickle at kemper.freedesktop.org
Wed Mar 12 14:35:59 PDT 2008


 src/cairo-cff-subset.c          |    1 +
 src/cairo-font-face.c           |    1 +
 src/cairo-ft-font.c             |    1 +
 src/cairo-output-stream.c       |    1 +
 src/cairo-pdf-surface.c         |    1 +
 src/cairo-ps-surface.c          |    1 +
 src/cairo-scaled-font-subsets.c |    1 +
 src/cairo-svg-surface.c         |    3 ++-
 src/cairo-truetype-subset.c     |    1 +
 src/cairo-type1-fallback.c      |    1 +
 src/cairo-type1-subset.c        |    1 +
 src/cairoint.h                  |    2 +-
 12 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit c86cbcdd644e043dc5ae2eabf5dd6afa020e2358
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Mar 12 17:54:54 2008 +0000

    [cairoint.h] Mark _cairo_image_analyze_transparency as private.
    
    Add the required cairo_private markup for make check.

diff --git a/src/cairoint.h b/src/cairoint.h
index a1f384c..9108d19 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -1904,7 +1904,7 @@ cairo_private cairo_image_surface_t *
 _cairo_image_surface_clone (cairo_image_surface_t	*surface,
 			    cairo_format_t		 format);
 
-cairo_image_transparency_t
+cairo_private cairo_image_transparency_t
 _cairo_image_analyze_transparency (cairo_image_surface_t      *image);
 
 cairo_private cairo_bool_t
commit 222eb6f1400ab7a51632cbc18b1526664e50c2e4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Mar 12 17:52:16 2008 +0000

    Define _BSD_SOURCE to enable prototypes for strdup, snprintf.
    
    strdup() and friends require at least _BSD_SOURCE or
    _XOPEN_SOURCE >= 500 to be defined for the prototypes to be included.
    For the time being, add the define to each source file that requires one
    of the BSD functions.

diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
index 1c09492..a3dc527 100644
--- a/src/cairo-cff-subset.c
+++ b/src/cairo-cff-subset.c
@@ -34,6 +34,7 @@
  *      Eugeniy Meshcheryakov <eugen at debian.org>
  */
 
+#define _BSD_SOURCE /* for snprintf(), strdup() */
 #include "cairoint.h"
 #include "cairo-scaled-font-subsets-private.h"
 #include "cairo-truetype-subset-private.h"
diff --git a/src/cairo-font-face.c b/src/cairo-font-face.c
index 2077120..c7f0a44 100644
--- a/src/cairo-font-face.c
+++ b/src/cairo-font-face.c
@@ -38,6 +38,7 @@
  *      Owen Taylor <otaylor at redhat.com>
  */
 
+#define _BSD_SOURCE /* for strdup() */
 #include "cairoint.h"
 
 /* Forward declare so we can use it as an arbitrary backend for
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index a781da4..cc9adc3 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -37,6 +37,7 @@
  *      Carl Worth <cworth at cworth.org>
  */
 
+#define _BSD_SOURCE /* for strdup() */
 #include "cairoint.h"
 
 #include "cairo-ft-private.h"
diff --git a/src/cairo-output-stream.c b/src/cairo-output-stream.c
index a9bc6ef..b337994 100644
--- a/src/cairo-output-stream.c
+++ b/src/cairo-output-stream.c
@@ -33,6 +33,7 @@
  *	Kristian Høgsberg <krh at redhat.com>
  */
 
+#define _BSD_SOURCE /* for snprintf() */
 #include "cairoint.h"
 
 #include "cairo-output-stream-private.h"
diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
index 6a59af4..e6e9626 100644
--- a/src/cairo-pdf-surface.c
+++ b/src/cairo-pdf-surface.c
@@ -39,6 +39,7 @@
  *	Adrian Johnson <ajohnson at redneon.com>
  */
 
+#define _BSD_SOURCE /* for snprintf() */
 #include "cairoint.h"
 #include "cairo-pdf.h"
 #include "cairo-pdf-surface-private.h"
diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index cbaaead..f5838ab 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -40,6 +40,7 @@
  *	Adrian Johnson <ajohnson at redneon.com>
  */
 
+#define _BSD_SOURCE /* for ctime_r(), snprintf(), strdup() */
 #include "cairoint.h"
 #include "cairo-ps.h"
 #include "cairo-ps-surface-private.h"
diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c
index 310bafb..f74c89b 100644
--- a/src/cairo-scaled-font-subsets.c
+++ b/src/cairo-scaled-font-subsets.c
@@ -40,6 +40,7 @@
  *	Adrian Johnson <ajohnson at redneon.com>
  */
 
+#define _BSD_SOURCE /* for snprintf(), strdup() */
 #include "cairoint.h"
 #include "cairo-scaled-font-subsets-private.h"
 
diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c
index 92aa5e9..997cadb 100644
--- a/src/cairo-svg-surface.c
+++ b/src/cairo-svg-surface.c
@@ -35,10 +35,11 @@
  *
  * Contributor(s):
  *	Kristian Høgsberg <krh at redhat.com>
- * 	Emmanuel Pacaud <emmanuel.pacaud at free.fr>
+ *	Emmanuel Pacaud <emmanuel.pacaud at free.fr>
  *	Carl Worth <cworth at cworth.org>
  */
 
+#define _BSD_SOURCE /* for snprintf() */
 #include "cairoint.h"
 #include "cairo-svg.h"
 #include "cairo-svg-surface-private.h"
diff --git a/src/cairo-truetype-subset.c b/src/cairo-truetype-subset.c
index 6eeafa4..f143882 100644
--- a/src/cairo-truetype-subset.c
+++ b/src/cairo-truetype-subset.c
@@ -34,6 +34,7 @@
  *	Adrian Johnson <ajohnson at redneon.com>
  */
 
+#define _BSD_SOURCE /* for snprintf(), strdup() */
 #include "cairoint.h"
 
 #include "cairo-scaled-font-subsets-private.h"
diff --git a/src/cairo-type1-fallback.c b/src/cairo-type1-fallback.c
index 219bd39..b465a13 100644
--- a/src/cairo-type1-fallback.c
+++ b/src/cairo-type1-fallback.c
@@ -33,6 +33,7 @@
  *	Adrian Johnson <ajohnson at redneon.com>
  */
 
+#define _BSD_SOURCE /* for snprintf(), strdup() */
 #include "cairoint.h"
 #include "cairo-type1-private.h"
 #include "cairo-scaled-font-subsets-private.h"
diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
index 8b96aa7..6afd4cd 100644
--- a/src/cairo-type1-subset.c
+++ b/src/cairo-type1-subset.c
@@ -33,6 +33,7 @@
  *	Kristian Høgsberg <krh at redhat.com>
  */
 
+#define _BSD_SOURCE /* for snprintf(), strdup() */
 #include "cairoint.h"
 #include "cairo-type1-private.h"
 #include "cairo-scaled-font-subsets-private.h"


More information about the cairo-commit mailing list