[cairo-commit] 4 commits - perf/cairo-perf-diff-files.c pixman/src src/Makefile.am

[Carl Worth]

 perf/cairo-perf-diff-files.c |   13 +++++++++++--
 pixman/src/pixman.h          |    3 +++
 src/Makefile.am              |    2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
diff-tree 7e6ab5461c2eb75c948bcb4725613ebe826c697a (from 422798db1d73c1a8ecc5877133b0325023f38e61)
Author: Carl Worth <cworth at cworth.org>
Date:   Sat Apr 28 07:46:56 2007 -0700

    Add missing prototypes for getline and strndup
    
    This is needed to prevent breaking the build for non-GNU systems.

diff --git a/perf/cairo-perf-diff-files.c b/perf/cairo-perf-diff-files.c
index 108940d..2fd6229 100644
--- a/perf/cairo-perf-diff-files.c
+++ b/perf/cairo-perf-diff-files.c
@@ -94,6 +94,14 @@ typedef struct _cairo_perf_diff_files_ar
     cairo_perf_report_options_t options;
 } cairo_perf_diff_files_args_t;
 
+#ifndef __USE_GNU
+static ssize_t
+getline (char **lineptr, size_t *n, FILE *stream);
+
+static char *
+strndup (const char *s, size_t n);
+#endif
+
 /* Ad-hoc parsing, macros with a strong dependence on the calling
  * context, and plenty of other ugliness is here.  But at least it's
  * not perl... */
@@ -248,7 +256,7 @@ test_report_parse (test_report_t *report
  */
 #ifndef __USE_GNU
 #define POORMANS_GETLINE_BUFFER_SIZE (65536)
-ssize_t
+static ssize_t
 getline (char **lineptr, size_t *n, FILE *stream)
 {
     if (!*lineptr)
@@ -272,7 +280,7 @@ getline (char **lineptr, size_t *n, FILE
 }
 #undef POORMANS_GETLINE_BUFFER_SIZE
 
-char *
+static char *
 strndup (const char *s, size_t n)
 {
     size_t len;
diff-tree 422798db1d73c1a8ecc5877133b0325023f38e61 (from d89d8e6b45b7c13b77aa7c2f1c480f58429b08af)
Author: Carl Worth <cworth at cworth.org>
Date:   Sat Apr 28 07:46:15 2007 -0700

    cairo-perf-diff-files: Add missing include of libgen.h for basename

diff --git a/perf/cairo-perf-diff-files.c b/perf/cairo-perf-diff-files.c
index adbc63b..108940d 100644
--- a/perf/cairo-perf-diff-files.c
+++ b/perf/cairo-perf-diff-files.c
@@ -38,6 +38,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <assert.h>
+#include <libgen.h>
 
 typedef struct _test_report {
     int id;
diff-tree d89d8e6b45b7c13b77aa7c2f1c480f58429b08af (from cb6fcdae92503964448144413e48ac388861d95f)
Author: Carl Worth <cworth at cworth.org>
Date:   Sat Apr 28 07:45:26 2007 -0700

    pixman.h: Add missing definition of WARN_UNUSED_RESULT
    
    This was breaking the build on systems without support for the
    __warn_unused_result__ attribute.

diff --git a/pixman/src/pixman.h b/pixman/src/pixman.h
index b905b47..8a2dd18 100644
--- a/pixman/src/pixman.h
+++ b/pixman/src/pixman.h
@@ -103,6 +103,9 @@ SOFTWARE.
 #define pixman_private_no_warn
 #endif
 
+#ifndef WARN_UNUSED_RESULT
+#define WARN_UNUSED_RESULT
+#endif
 /* Add attribute(warn_unused_result) if supported */
 #define pixman_warn WARN_UNUSED_RESULT
 #define pixman_private pixman_private_no_warn pixman_warn
diff-tree cb6fcdae92503964448144413e48ac388861d95f (from a392cc85081dd1e0fa3342c313af94a1e0c289b1)
Author: Carl Worth <cworth at cworth.org>
Date:   Sat Apr 28 07:38:56 2007 -0700

    Fix typo in Makefile preventing builds from succeeding
    
    The cairo-ps-surface-private.h file was not getting included in the
    distribution.

diff --git a/src/Makefile.am b/src/Makefile.am
index 554c4fb..664698e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ backend_pkgconfigs =
 
 if CAIRO_HAS_PS_SURFACE
 libcairo_ps_headers = cairo-ps.h
-libcairo_ps_sources = cairo-ps-surface.c cairo-pdf-surface-private.h
+libcairo_ps_sources = cairo-ps-surface.c cairo-ps-surface-private.h
 libcairo_font_subset_sources =	$(font_subset_sources)
 backend_pkgconfigs += cairo-ps.pc
 endif