summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>2015-02-26 15:03:43 +0100
committerBryce Harrington <b.harrington@samsung.com>2015-03-05 17:02:14 -0800
commit0916d580db94bccbf8d31cc58a8198a0c1f8b309 (patch)
tree5458b78e8c2a29506bf9781e2384952296baf268
parente9a615a2f94697c64a6702c1e3b24c59b156cc71 (diff)
test: fix include order for AIX, bug#89354
-rw-r--r--test/clip-nesting.c2
-rw-r--r--test/clip-operator.c2
-rw-r--r--test/close-path.c2
-rw-r--r--test/composite-integer-translate-over-repeat.c2
-rw-r--r--test/composite-integer-translate-over.c2
-rw-r--r--test/composite-integer-translate-source.c2
-rw-r--r--test/copy-path.c2
-rw-r--r--test/extend-pad-border.c2
-rw-r--r--test/extend-pad-similar.c2
-rw-r--r--test/extend-pad.c2
-rw-r--r--test/extend-reflect.c2
-rw-r--r--test/extended-blend.c2
-rw-r--r--test/mask.c2
-rw-r--r--test/multi-page.c4
-rw-r--r--test/operator-clear.c2
-rw-r--r--test/operator-source.c2
-rw-r--r--test/path-append.c2
-rw-r--r--test/pattern-getters.c2
-rw-r--r--test/pdf-features.c4
-rw-r--r--test/pixman-downscale.c4
-rw-r--r--test/pixman-rotate.c4
-rw-r--r--test/ps-features.c4
-rw-r--r--test/record-extend.c2
-rw-r--r--test/record-mesh.c2
-rw-r--r--test/select-font-no-show-text.c2
-rw-r--r--test/self-copy.c2
-rw-r--r--test/source-clip-scale.c2
-rw-r--r--test/source-clip.c2
-rw-r--r--test/surface-pattern-scale-down.c2
-rw-r--r--test/surface-pattern-scale-up.c2
-rw-r--r--test/surface-pattern.c2
-rw-r--r--test/svg-clip.c3
-rw-r--r--test/svg-surface.c3
-rw-r--r--test/trap-clip.c2
-rw-r--r--test/unbounded-operator.c2
-rw-r--r--test/user-font-mask.c4
-rw-r--r--test/user-font-proxy.c4
-rw-r--r--test/user-font.c4
-rw-r--r--test/xcb-snapshot-assert.c2
-rw-r--r--test/xlib-expose-event.c2
-rw-r--r--test/xlib-surface.c3
41 files changed, 52 insertions, 49 deletions
diff --git a/test/clip-nesting.c b/test/clip-nesting.c
index ce03b4b18..a9227ec77 100644
--- 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
diff --git a/test/clip-operator.c b/test/clip-operator.c
index aaa344539..ac0a5e966 100644
--- 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
diff --git a/test/close-path.c b/test/close-path.c
index 41b237e12..f1f1230fa 100644
--- 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;
diff --git a/test/composite-integer-translate-over-repeat.c b/test/composite-integer-translate-over-repeat.c
index 9a60d9a9a..d9e00057b 100644
--- 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
diff --git a/test/composite-integer-translate-over.c b/test/composite-integer-translate-over.c
index 8c6b9c232..4f89fa856 100644
--- 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
diff --git a/test/composite-integer-translate-source.c b/test/composite-integer-translate-source.c
index a05133c65..e6fd93366 100644
--- 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
diff --git a/test/copy-path.c b/test/copy-path.c
index c5f939844..25823b6b1 100644
--- 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)
diff --git a/test/extend-pad-border.c b/test/extend-pad-border.c
index de8105cff..c02ec4f00 100644
--- 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
diff --git a/test/extend-pad-similar.c b/test/extend-pad-similar.c
index 357252ac2..09a90f46d 100644
--- 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
diff --git a/test/extend-pad.c b/test/extend-pad.c
index 15a2079b9..f851d44a4 100644
--- 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
diff --git a/test/extend-reflect.c b/test/extend-reflect.c
index 16b08c155..173befc26 100644
--- 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";
diff --git a/test/extended-blend.c b/test/extended-blend.c
index a45ddc9cb..8edd182d6 100644
--- 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
diff --git a/test/mask.c b/test/mask.c
index cc722d384..89f4c3cc2 100644
--- 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
diff --git a/test/multi-page.c b/test/multi-page.c
index e2c7ddf20..a3102dba3 100644
--- 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.
diff --git a/test/operator-clear.c b/test/operator-clear.c
index aac39f3d8..72a32c219 100644
--- 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
diff --git a/test/operator-source.c b/test/operator-source.c
index 3dee57000..9330a65d1 100644
--- 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
diff --git a/test/path-append.c b/test/path-append.c
index bcd282db0..bdcc63abf 100644
--- 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)
diff --git a/test/pattern-getters.c b/test/pattern-getters.c
index 28bc1f99a..08508d7d4 100644
--- 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) { \
diff --git a/test/pdf-features.c b/test/pdf-features.c
index 0cc50ed19..b9c2bd07a 100644
--- 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:
diff --git a/test/pixman-downscale.c b/test/pixman-downscale.c
index a57db0292..6b653d223 100644
--- 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 */
diff --git a/test/pixman-rotate.c b/test/pixman-rotate.c
index f412ce6dc..e0d0fc885 100644
--- 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
diff --git a/test/ps-features.c b/test/ps-features.c
index fe5de42fa..d1abf91fe 100644
--- 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:
diff --git a/test/record-extend.c b/test/record-extend.c
index 5ecef449d..8e8387151 100644
--- 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
diff --git a/test/record-mesh.c b/test/record-mesh.c
index 2581ce7b9..754a1d430 100644
--- 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
diff --git a/test/select-font-no-show-text.c b/test/select-font-no-show-text.c
index 0b7241530..b2b47966f 100644
--- 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)
diff --git a/test/self-copy.c b/test/self-copy.c
index 32a375a0c..bef02e98b 100644
--- 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
diff --git a/test/source-clip-scale.c b/test/source-clip-scale.c
index 375f9be19..4eca2061c 100644
--- 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
diff --git a/test/source-clip.c b/test/source-clip.c
index cbb28551f..0c00070b1 100644
--- 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
diff --git a/test/surface-pattern-scale-down.c b/test/surface-pattern-scale-down.c
index 639019c02..95782efb1 100644
--- 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
diff --git a/test/surface-pattern-scale-up.c b/test/surface-pattern-scale-up.c
index 26e75c8c7..0d71ba150 100644
--- 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
diff --git a/test/surface-pattern.c b/test/surface-pattern.c
index ff95475c0..725f68d00 100644
--- 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
diff --git a/test/svg-clip.c b/test/svg-clip.c
index b39e29f8c..dff65f7cc 100644
--- 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 */
diff --git a/test/svg-surface.c b/test/svg-surface.c
index 8ee3b613c..13b006d39 100644
--- 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.
diff --git a/test/trap-clip.c b/test/trap-clip.c
index acfcafcb7..f1a24ca8d 100644
--- 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
diff --git a/test/unbounded-operator.c b/test/unbounded-operator.c
index 6e132fb2f..ac1c50d1d 100644
--- 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
diff --git a/test/user-font-mask.c b/test/user-font-mask.c
index a6d394e9f..cf548e649 100644
--- 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
diff --git a/test/user-font-proxy.c b/test/user-font-proxy.c
index 41a69e708..6a39d8ed8 100644
--- 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
diff --git a/test/user-font.c b/test/user-font.c
index 30bc74e35..435d5616f 100644
--- 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
diff --git a/test/xcb-snapshot-assert.c b/test/xcb-snapshot-assert.c
index a67447678..b578f8c7e 100644
--- 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)
diff --git a/test/xlib-expose-event.c b/test/xlib-expose-event.c
index 4b1cb46d0..1de23e01e 100644
--- 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"
diff --git a/test/xlib-surface.c b/test/xlib-surface.c
index 4edc44bc4..137b28232 100644
--- 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"