test: fix include order for AIX, bug#89354

2026-03-29 07:50:36 +02:00 · 2015-02-26 15:03:43 +01:00 · 2015-02-26 15:03:43 +01:00 · e91ebe3dd0
commit e91ebe3dd0
parent b0f3465d09
41 changed files with 52 additions and 49 deletions
--- a/test/clip-nesting.c
+++ b/test/clip-nesting.c
@ -23,8 +23,8 @@
 * Author: Owen Taylor <otaylor@redhat.com>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 100
--- a/test/clip-operator.c
+++ b/test/clip-operator.c
@ -23,8 +23,8 @@
 * Author: Kristian Høgsberg <krh@redhat.com>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define WIDTH 16
--- a/test/close-path.c
+++ b/test/close-path.c
@ -23,8 +23,8 @@
 * Author: Carl D. Worth <cworth@cworth.org>
 */

-#include <stdlib.h>
 #include "cairo-test.h"
+#include <stdlib.h>

 static cairo_test_draw_function_t draw;

--- a/test/composite-integer-translate-over-repeat.c
+++ b/test/composite-integer-translate-over-repeat.c
@ -24,8 +24,8 @@
 * Author: Vladimir Vukicevic <vladimir@pobox.com>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 100
--- a/test/composite-integer-translate-over.c
+++ b/test/composite-integer-translate-over.c
@ -22,8 +22,8 @@
 *
 * Author: Vladimir Vukicevic <vladimir@pobox.com>
 */
-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 100
--- a/test/composite-integer-translate-source.c
+++ b/test/composite-integer-translate-source.c
@ -24,8 +24,8 @@
 * Author: Vladimir Vukicevic <vladimir@pobox.com>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 100
--- a/test/copy-path.c
+++ b/test/copy-path.c
@ -23,8 +23,8 @@
 * Author: Carl D. Worth <cworth@cworth.org>
 */

-#include <stdlib.h>
 #include "cairo-test.h"
+#include <stdlib.h>

 static void
 scale_by_two (double *x, double *y)
--- a/test/extend-pad-border.c
+++ b/test/extend-pad-border.c
@ -24,8 +24,8 @@
 * Author: Behdad Esfahbod <behdad@behdad.org>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 90
--- a/test/extend-pad-similar.c
+++ b/test/extend-pad-similar.c
@ -24,8 +24,8 @@
 * Author: Behdad Esfahbod <behdad@behdad.org>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 90
--- a/test/extend-pad.c
+++ b/test/extend-pad.c
@ -24,8 +24,8 @@
 * Author: Behdad Esfahbod <behdad@behdad.org>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 90
--- a/test/extend-reflect.c
+++ b/test/extend-reflect.c
@ -1,5 +1,5 @@
-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 static const char *png_filename = "romedalen.png";
--- a/test/extended-blend.c
+++ b/test/extended-blend.c
@ -27,8 +27,8 @@
 *          Emmanuel Pacaud <emmanuel.pacaud@lapp.in2p3.fr>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define STEPS 16
--- a/test/mask.c
+++ b/test/mask.c
@ -24,8 +24,8 @@
 *          Kristian Høgsberg <krh@redhat.com>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define WIDTH 16
--- a/test/multi-page.c
+++ b/test/multi-page.c
@ -23,6 +23,8 @@
 * Author: Carl D. Worth <cworth@cworth.org>
 */

+#include "cairo-test.h"
+
 #include <stdio.h>

 #include <cairo.h>
@ -35,8 +37,6 @@
 #include <cairo-pdf.h>
 #endif

-#include "cairo-test.h"
-
 /* The PostScript and PDF backends are now integrated into the main
 * test suite, so we are getting good verification of most things
 * there.
--- a/test/operator-clear.c
+++ b/test/operator-clear.c
@ -24,8 +24,8 @@
 *          Owen Taylor <otaylor@redhat.com>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define WIDTH 16
--- a/test/operator-source.c
+++ b/test/operator-source.c
@ -25,8 +25,8 @@
 *          Uli Schlachter <psychon@znc.in>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define WIDTH 16
--- a/test/path-append.c
+++ b/test/path-append.c
@ -21,8 +21,8 @@
 * OF THIS SOFTWARE.
 */

-#include <stdlib.h>
 #include "cairo-test.h"
+#include <stdlib.h>

 static cairo_test_status_t
 draw (cairo_t *cr, int width, int height)
--- a/test/pattern-getters.c
+++ b/test/pattern-getters.c
@ -24,8 +24,8 @@
 * Author: Vladimir Vukicevic <vladimir@pobox.com>
 */

-#include <stdlib.h>
 #include "cairo-test.h"
+#include <stdlib.h>

 #define CHECK_SUCCESS do { \
    if (status) { \
--- a/test/pdf-features.c
+++ b/test/pdf-features.c
@ -23,12 +23,12 @@
 * Author: Carl D. Worth <cworth@cworth.org>
 */

+#include "cairo-test.h"
+
 #include <stdio.h>
 #include <cairo.h>
 #include <cairo-pdf.h>

-#include "cairo-test.h"
-
 /* This test exists to test the various features of cairo-pdf.h.
 *
 * Currently, this test exercises the following function calls:
--- a/test/pixman-downscale.c
+++ b/test/pixman-downscale.c
@ -29,13 +29,13 @@
 * Currently, this exercises several of pixman's scaling filters.
 */

+#include "cairo-test.h"
+
 #include <stdio.h>
 #include <stdlib.h>

 #include <cairo.h>

-#include "cairo-test.h"
-
 static const char png_filename[] = "quad-color.png";

 /* Draw an image scaled down, with antialiasing disabled */
--- a/test/pixman-rotate.c
+++ b/test/pixman-rotate.c
@ -24,6 +24,8 @@
 * Author: Kristian Høgsberg <krh@redhat.com>
 */

+#include "cairo-test.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@ -31,8 +33,6 @@

 #include <cairo.h>

-#include "cairo-test.h"
-
 #define WIDTH	32
 #define HEIGHT	WIDTH

--- a/test/ps-features.c
+++ b/test/ps-features.c
@ -23,12 +23,12 @@
 * Author: Carl D. Worth <cworth@cworth.org>
 */

+#include "cairo-test.h"
+
 #include <stdio.h>
 #include <cairo.h>
 #include <cairo-ps.h>

-#include "cairo-test.h"
-
 /* This test exists to test the various features of cairo-ps.h.
 *
 * Currently, this test exercises the following function calls:
--- a/test/record-extend.c
+++ b/test/record-extend.c
@ -27,8 +27,8 @@
 *	Chris Wilson <chris@chris-wilson.co.uk>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 90
--- a/test/record-mesh.c
+++ b/test/record-mesh.c
@ -29,8 +29,8 @@
 *	Chris Wilson <chris@chris-wilson.co.uk>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define PAT_WIDTH  170
--- a/test/select-font-no-show-text.c
+++ b/test/select-font-no-show-text.c
@ -38,8 +38,8 @@
 *  Fixed... just a stray free().
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>

 static cairo_test_status_t
 draw (cairo_t *cr, int width, int height)
--- a/test/self-copy.c
+++ b/test/self-copy.c
@ -23,8 +23,8 @@
 * Author: Owen Taylor <otaylor@redhat.com>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 40
--- a/test/source-clip-scale.c
+++ b/test/source-clip-scale.c
@ -23,8 +23,8 @@
 * Author: Vladimir Vukicevic <vladimir@pobox.com>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 12
--- a/test/source-clip.c
+++ b/test/source-clip.c
@ -23,8 +23,8 @@
 * Author: Owen Taylor <otaylor@redhat.com>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 12
--- a/test/surface-pattern-scale-down.c
+++ b/test/surface-pattern-scale-down.c
@ -24,8 +24,8 @@
 * Author: Behdad Esfahbod <behdad@behdad.org>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 200
--- a/test/surface-pattern-scale-up.c
+++ b/test/surface-pattern-scale-up.c
@ -27,8 +27,8 @@
 /* Exhibits nasty behaviour with GS due as their /Interpolate implementation
 * does not function for rotated images. */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 100
--- a/test/surface-pattern.c
+++ b/test/surface-pattern.c
@ -24,8 +24,8 @@
 * Author: Behdad Esfahbod <behdad@behdad.org>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define SIZE 140
--- a/test/svg-clip.c
+++ b/test/svg-clip.c
@ -23,10 +23,11 @@
 * Author: Kristian Høgsberg <krh@redhat.com>
 */

+#include "cairo-test.h"
+
 #include <stdio.h>

 #include <cairo-svg.h>
-#include "cairo-test.h"

 /* Test SVG clipping */

--- a/test/svg-surface.c
+++ b/test/svg-surface.c
@ -23,10 +23,11 @@
 * Author: Carl D. Worth <cworth@cworth.org>
 */

+#include "cairo-test.h"
+
 #include <stdio.h>

 #include <cairo-svg.h>
-#include "cairo-test.h"

 /* Pretty boring test just to make sure things aren't crashing ---
 * no verification that we're getting good results yet.
--- a/test/trap-clip.c
+++ b/test/trap-clip.c
@ -23,8 +23,8 @@
 * Author: Kristian Høgsberg <krh@redhat.com>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define WIDTH 16
--- a/test/unbounded-operator.c
+++ b/test/unbounded-operator.c
@ -24,8 +24,8 @@
 *          Owen Taylor <otaylor@redhat.com>
 */

-#include <math.h>
 #include "cairo-test.h"
+#include <math.h>
 #include <stdio.h>

 #define WIDTH 16
--- a/test/user-font-mask.c
+++ b/test/user-font-mask.c
@ -26,11 +26,11 @@
 *	Adrian Johnson <ajohnson@redneon.com>
 */

+#include "cairo-test.h"
+
 #include <stdlib.h>
 #include <stdio.h>

-#include "cairo-test.h"
-
 /*#define ROTATED 1*/

 #define BORDER 10
--- a/test/user-font-proxy.c
+++ b/test/user-font-proxy.c
@ -25,11 +25,11 @@
 *	Behdad Esfahbod <behdad@behdad.org>
 */

+#include "cairo-test.h"
+
 #include <stdlib.h>
 #include <stdio.h>

-#include "cairo-test.h"
-
 /*#define ROTATED 1*/

 #define BORDER 10
--- a/test/user-font.c
+++ b/test/user-font.c
@ -25,11 +25,11 @@
 *	Behdad Esfahbod <behdad@behdad.org>
 */

+#include "cairo-test.h"
+
 #include <stdlib.h>
 #include <stdio.h>

-#include "cairo-test.h"
-
 /*#define ROTATED 1*/

 #define BORDER 10
--- a/test/xcb-snapshot-assert.c
+++ b/test/xcb-snapshot-assert.c
@ -24,8 +24,8 @@
 * Author: Uli Schlachter <psychon@znc.in>
 */

-#include "cairo.h"
 #include "cairo-test.h"
+#include "cairo.h"

 static cairo_surface_t *
 create_image (int width, int height)
--- a/test/xlib-expose-event.c
+++ b/test/xlib-expose-event.c
@ -31,12 +31,12 @@
 * made the same mistake again, it is worth adding a regression test...
 */

+#include "cairo-test.h"

 #include <stdio.h>
 #include <stdlib.h>

 #include "cairo.h"
-#include "cairo-test.h"

 #include "buffer-diff.h"

--- a/test/xlib-surface.c
+++ b/test/xlib-surface.c
@ -23,12 +23,13 @@
 * Author: Carl D. Worth <cworth@cworth.org>
 */

+#include "cairo-test.h"
+
 #include <stdio.h>
 #include <stdlib.h>

 #include "cairo.h"
 #include "cairo-xlib.h"
-#include "cairo-test.h"

 #include "cairo-boilerplate-xlib.h"