diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2007-04-20 00:13:25 -0400 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2007-04-20 00:52:03 -0400 |
commit | 99737a60cb8cae1643b84782768e8c6d50ac7d0a (patch) | |
tree | e069e6c0b1a2a8a1b3d3aa44a441b5156fe89d44 | |
parent | 4b569f13d758015f33ad258a70ad4f472da771ed (diff) |
[boilerplate] Clean up includes and remove unnecessary ones
-rw-r--r-- | boilerplate/cairo-boilerplate-directfb.c | 9 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate-pdf.c | 2 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate-svg.c | 2 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate-xcb.c | 2 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate.c | 30 |
5 files changed, 17 insertions, 28 deletions
diff --git a/boilerplate/cairo-boilerplate-directfb.c b/boilerplate/cairo-boilerplate-directfb.c index 1e903dca..894672d0 100644 --- a/boilerplate/cairo-boilerplate-directfb.c +++ b/boilerplate/cairo-boilerplate-directfb.c @@ -9,13 +9,14 @@ make check */ -#include <stdio.h> -#include <stdlib.h> #include "cairo-boilerplate.h" -#include <directfb.h> -#include "cairo-directfb.h" #include "cairo-boilerplate-directfb-private.h" +#include <cairo-directfb.h> + +#include <stdio.h> +#include <stdlib.h> + /* macro for a safe call to DirectFB functions */ #define DFBCHECK(x...) \ { \ diff --git a/boilerplate/cairo-boilerplate-pdf.c b/boilerplate/cairo-boilerplate-pdf.c index 0b1dec04..13f9ef86 100644 --- a/boilerplate/cairo-boilerplate-pdf.c +++ b/boilerplate/cairo-boilerplate-pdf.c @@ -27,7 +27,7 @@ #include "cairo-boilerplate.h" #include "cairo-boilerplate-pdf-private.h" -#include "cairo-pdf.h" +#include <cairo-pdf.h> cairo_user_data_key_t pdf_closure_key; diff --git a/boilerplate/cairo-boilerplate-svg.c b/boilerplate/cairo-boilerplate-svg.c index 81930319..cc344c93 100644 --- a/boilerplate/cairo-boilerplate-svg.c +++ b/boilerplate/cairo-boilerplate-svg.c @@ -27,7 +27,7 @@ #include "cairo-boilerplate.h" #include "cairo-boilerplate-svg-private.h" -#include "cairo-svg.h" +#include <cairo-svg.h> cairo_user_data_key_t svg_closure_key; diff --git a/boilerplate/cairo-boilerplate-xcb.c b/boilerplate/cairo-boilerplate-xcb.c index 2cc88cde..1a74d18b 100644 --- a/boilerplate/cairo-boilerplate-xcb.c +++ b/boilerplate/cairo-boilerplate-xcb.c @@ -27,7 +27,7 @@ #include "cairo-boilerplate.h" #include "cairo-boilerplate-xcb-private.h" -#include "cairo-xcb-xrender.h" +#include <cairo-xcb-xrender.h> #include <xcb/xcb_renderutil.h> diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c index e1d4bb2f..1e398185 100644 --- a/boilerplate/cairo-boilerplate.c +++ b/boilerplate/cairo-boilerplate.c @@ -26,24 +26,6 @@ #include "cairo-boilerplate.h" -#include <stdio.h> -#include <stdlib.h> -#include <stdarg.h> -#include <ctype.h> -#include <setjmp.h> -#ifdef HAVE_SIGNAL_H -#include <signal.h> -#endif -#include <assert.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#include <errno.h> -#include <string.h> -#if HAVE_FCFINI -#include <fontconfig/fontconfig.h> -#endif - #if CAIRO_HAS_BEOS_SURFACE #include "cairo-boilerplate-beos-private.h" #endif @@ -75,6 +57,12 @@ #include "cairo-boilerplate-xlib-private.h" #endif +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> +#include <ctype.h> +#include <assert.h> + /* This is copied from cairoint.h. That makes it painful to keep in * sync, but the slim stuff makes cairoint.h "hard" to include when * not actually building the cairo library itself. Fortunately, since @@ -136,9 +124,9 @@ _cairo_boilerplate_image_create_surface (const char *name, #ifdef CAIRO_HAS_TEST_SURFACES -#include "test-fallback-surface.h" -#include "test-meta-surface.h" -#include "test-paginated-surface.h" +#include <test-fallback-surface.h> +#include <test-meta-surface.h> +#include <test-paginated-surface.h> static cairo_surface_t * _cairo_boilerplate_test_fallback_create_surface (const char *name, |