diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2008-09-02 20:20:49 -0400 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2008-09-02 20:24:08 -0400 |
commit | 59262577708ddb656851624377efb2a671fa8ca3 (patch) | |
tree | 2c75bd94e2cfe3efb333b0b1509c0540181af100 /src/cairo-xlib-xrender-private.h | |
parent | 5cb3e66305b25a3380f2ca5829ac81e4a27e76d0 (diff) | |
download | cairo-59262577708ddb656851624377efb2a671fa8ca3.tar.gz |
Revamp the build system.
Quick summary of changes:
- Move list of cairo source files out of src/Makefile.am and into
src/Sources.mk,
- Generate files src/Config.mk and src/Config.mk.win32 that choose
the right set of source files and headers based on configured
backends and features. This drastically simplifies building
using other build systems. The src/Makefile.win32 file needs
to be updated to reflect these changes.
- Add README files to various directories,
- Add toplevel HACKING file.
Diffstat (limited to 'src/cairo-xlib-xrender-private.h')
-rw-r--r-- | src/cairo-xlib-xrender-private.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/cairo-xlib-xrender-private.h b/src/cairo-xlib-xrender-private.h index a61a67e52..329262c77 100644 --- a/src/cairo-xlib-xrender-private.h +++ b/src/cairo-xlib-xrender-private.h @@ -33,6 +33,11 @@ #ifndef CAIRO_XLIB_XRENDER_PRIVATE_H #define CAIRO_XLIB_XRENDER_PRIVATE_H +#include "cairo-features.h" +#include "cairo-compiler-private.h" + +#include <X11/Xlib.h> + #if CAIRO_HAS_XLIB_XRENDER_SURFACE #include "cairo-xlib-xrender.h" @@ -52,7 +57,7 @@ * take a pointer as first argument */ __attribute__((__unused__)) static void _void_consume (void *p, ...) { } -__attribute__((__unused__)) static void * _voidp_consume (void *p, ...) { return NULL; } +__attribute__((__unused__)) static void * _voidp_consume (void *p, ...) { return (void *)0; } __attribute__((__unused__)) static int _int_consume (void *p, ...) { return 0; } __attribute__((__unused__)) static void _void_consume_free (Display *p, XID n) { } |