[cairo-commit] 2 commits - src/cairo-gl-info.c src/cairo-line-private.h

[Bryce Harrington]

 src/cairo-gl-info.c      |    4 ++--
 src/cairo-line-private.h |   11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 7c1db82a2e9dc04fd652d6e6bb6f4eb976922368
Author: Bryce Harrington <bryce at osg.samsung.com>
Date:   Fri Oct 3 12:34:06 2014 -0700

    Get make check back to a happy spot
    
    Fix header ordering for some recently added code so cairo internal
    headers are included first.  Quells two make check errors.
    
    Fixes:  https://bugs.freedesktop.org/show_bug.cgi?id=84638

diff --git a/src/cairo-gl-info.c b/src/cairo-gl-info.c
index 66b0b50..acefbb9 100644
--- a/src/cairo-gl-info.c
+++ b/src/cairo-gl-info.c
@@ -29,11 +29,11 @@
  *      Alexandros Frantzis <alexandros.frantzis at linaro.org>
  */
 
-#include <errno.h>
-
 #include "cairoint.h"
 #include "cairo-gl-private.h"
 
+#include <errno.h>
+
 int
 _cairo_gl_get_version (void)
 {
diff --git a/src/cairo-line-private.h b/src/cairo-line-private.h
index 30d5d68..08bf4b3 100644
--- a/src/cairo-line-private.h
+++ b/src/cairo-line-private.h
@@ -35,9 +35,9 @@
 #ifndef CAIRO_LINE_PRIVATE_H
 #define CAIRO_LINE_PRIVATE_H
 
-#include "cairo-compiler-private.h"
-#include "cairo-error-private.h"
 #include "cairo-types-private.h"
+#include "cairo-error-private.h"
+#include "cairo-compiler-private.h"
 
 CAIRO_BEGIN_DECLS
 
commit f57c0fd4656ef4fdbe13dbc69aa1ce4e130c37ce
Author: Bryce Harrington <bryce at osg.samsung.com>
Date:   Fri Oct 3 12:20:13 2014 -0700

    Declare as private the new cairo_lines_compare_at_y symbol
    
    Fixes a make check error.
    
      Checking that .libs/libcairo.so has the same symbol list as cairo.def
      126a127
      > cairo_lines_compare_at_y
    
    Fixes:  https://bugs.freedesktop.org/show_bug.cgi?id=84638
    Signed-off-by: Bryce Harrington <b.harrington at samsung.com>

diff --git a/src/cairo-line-private.h b/src/cairo-line-private.h
index ad401ef..30d5d68 100644
--- a/src/cairo-line-private.h
+++ b/src/cairo-line-private.h
@@ -41,9 +41,10 @@
 
 CAIRO_BEGIN_DECLS
 
-int cairo_lines_compare_at_y(const cairo_line_t *a,
-			     const cairo_line_t *b,
-			     int y);
+cairo_private int
+cairo_lines_compare_at_y(const cairo_line_t *a,
+			 const cairo_line_t *b,
+			 int y);
 
 CAIRO_END_DECLS