fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-15 16:40:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

xlib: Rearrange xrender stubs to restore compilation without xrender.h

Browse source
This commit is contained in:
Chris Wilson 2010-04-01 20:36:15 +01:00
parent db4dbb3834
commit d209b40c64
4 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
boilerplate/Makefile.win32.features
View file

@ -199,14 +199,6 @@ enabled_cairo_boilerplate_private += $(cairo_boilerplate_png_private)
enabled_cairo_boilerplate_sources += $(cairo_boilerplate_png_sources)
endif
supported_cairo_boilerplate_headers += $(cairo_boilerplate_glew_headers)
all_cairo_boilerplate_headers += $(cairo_boilerplate_glew_headers)
all_cairo_boilerplate_private += $(cairo_boilerplate_glew_private)
all_cairo_boilerplate_sources += $(cairo_boilerplate_glew_sources)
enabled_cairo_boilerplate_headers += $(cairo_boilerplate_glew_headers)
enabled_cairo_boilerplate_private += $(cairo_boilerplate_glew_private)
enabled_cairo_boilerplate_sources += $(cairo_boilerplate_glew_sources)
unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_gl_headers)
all_cairo_boilerplate_headers += $(cairo_boilerplate_gl_headers)
all_cairo_boilerplate_private += $(cairo_boilerplate_gl_private)

1
build/Makefile.win32.features-h
View file

@ -59,7 +59,6 @@ endif
ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
@echo "#define CAIRO_HAS_PNG_FUNCTIONS 1" >> src/cairo-features.h
endif
@echo "#define CAIRO_HAS_GLEW_FUNCTIONS 1" >> src/cairo-features.h
ifeq ($(CAIRO_HAS_GL_SURFACE),1)
@echo "#define CAIRO_HAS_GL_SURFACE 1" >> src/cairo-features.h
endif

8
src/Makefile.win32.features
View file

@ -273,14 +273,6 @@ ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
enabled_cairo_pkgconf += cairo-png.pc
endif
supported_cairo_headers += $(cairo_glew_headers)
all_cairo_headers += $(cairo_glew_headers)
all_cairo_private += $(cairo_glew_private)
all_cairo_sources += $(cairo_glew_sources)
enabled_cairo_headers += $(cairo_glew_headers)
enabled_cairo_private += $(cairo_glew_private)
enabled_cairo_sources += $(cairo_glew_sources)
unsupported_cairo_headers += $(cairo_gl_headers)
all_cairo_headers += $(cairo_gl_headers)
all_cairo_private += $(cairo_gl_private)

14
src/cairo-xlib-xrender-private.h
View file

@ -38,13 +38,6 @@
#include <X11/Xlib.h>
#if CAIRO_HAS_XLIB_XRENDER_SURFACE
#include "cairo-xlib-xrender.h"
#include <X11/extensions/Xrender.h>
#include <X11/extensions/renderproto.h>
/* These prototypes are used when defining interfaces missing from the
* render headers. As it happens, it is the case that all libxrender
* functions take a pointer as first argument. */
@ -55,6 +48,13 @@ __attribute__((__unused__)) static int _int_consume (void *p, ...)
__attribute__((__unused__)) static void _void_consume_free (Display *p, XID n) { }
#if CAIRO_HAS_XLIB_XRENDER_SURFACE
#include "cairo-xlib-xrender.h"
#include <X11/extensions/Xrender.h>
#include <X11/extensions/renderproto.h>
/* We require Render >= 0.6. The following defines were only added in
* 0.10. Make sure they are defined.
*/