[cairo-commit] 2 commits - configure.ac src/cairo-gl-shaders.c

[Andrea Canciani]

 configure.ac           |    4 ++--
 src/cairo-gl-shaders.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b53084b7c530ed0473137ee8ebfab70fdd8e3c23
Author: Markus Stange <mstange at themasta.com>
Date:   Fri Nov 5 09:23:44 2010 +0100

    Fix type of _cairo_memory_stream_destroy parameter
    
    In 9b9952ab4f64a476bbadfd3e6cf1e66c1137ccd7
    _cairo_memory_stream_destroy was changed to take an unsigned long
    instead of unsigned int, and the two callsites in cairo-gl-shaders.c
    weren't updated.

diff --git a/src/cairo-gl-shaders.c b/src/cairo-gl-shaders.c
index d7773f5..ea329dd 100644
--- a/src/cairo-gl-shaders.c
+++ b/src/cairo-gl-shaders.c
@@ -632,7 +632,7 @@ cairo_gl_shader_get_vertex_source (cairo_gl_var_type_t src,
 {
     cairo_output_stream_t *stream = _cairo_memory_stream_create ();
     unsigned char *source;
-    unsigned int length;
+    unsigned long length;
     cairo_status_t status;
 
     cairo_gl_shader_emit_variable (stream, src, CAIRO_GL_TEX_SOURCE);
@@ -768,7 +768,7 @@ cairo_gl_shader_get_fragment_source (GLuint tex_target,
 {
     cairo_output_stream_t *stream = _cairo_memory_stream_create ();
     unsigned char *source;
-    unsigned int length;
+    unsigned long length;
     cairo_status_t status;
 
     cairo_gl_shader_emit_color (stream, tex_target, src, CAIRO_GL_TEX_SOURCE);
commit 6dda9c4465fa229f3fe9927e8318121642b41c14
Author: Erik Zeek <zeekec at mad.scientist.com>
Date:   Thu Nov 4 17:57:03 2010 +0100

    Fix build on gentoo
    
    The problem is probably caused by a change in the behavior of autoconf
    (2.67).
    
    See http://bugs.gentoo.org/336329

diff --git a/configure.ac b/configure.ac
index 81c9e23..1238f5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,12 +3,12 @@ CAIRO_PARSE_VERSION
 AC_INIT([cairo],
 	[cairo_version_major.cairo_version_minor.cairo_version_micro],
 	[http://bugs.freedesktop.org/enter_bug.cgi?product=cairo])
+AC_CONFIG_AUX_DIR(build)
+AC_CONFIG_MACRO_DIR(build)
 AC_GNU_SOURCE
 AC_USE_SYSTEM_EXTENSIONS
 AC_CONFIG_SRCDIR(src/cairo.h)
 AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_AUX_DIR(build)
-AC_CONFIG_MACRO_DIR(build)
 AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL