isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 15:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Make cogl-config.h include check explicit

Browse Source 
Don't rely on some combination of macros, but an explicit definition to
check whether cogl-config.h was included.
This commit is contained in:
Jonas Ådahl 2018-05-21 22:18:03 +02:00
parent 9dbdf6b724
commit d68fcbc887
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl-mutter-config.h.in
View File

@ -3,3 +3,5 @@
/* Have GLES 2.0 for rendering */ /* Have GLES 2.0 for rendering */
#undef HAVE_COGL_GLES2 #undef HAVE_COGL_GLES2
#define COGL_CONFIG_H_INCLUDED 1

4
cogl/cogl/cogl-util.h
View File

@ -40,9 +40,7 @@
#include <stdio.h> #include <stdio.h>
/* Double check that config.h has been included */ /* Double check that config.h has been included */
#if (!defined (PACKAGE_NAME) && \ #ifndef COGL_CONFIG_H_INCLUDED
!defined (_COGL_IN_TEST_BITMASK) && \
!defined(COGL_ENABLE_MUTTER_API))
#error "cogl-config.h must be included before including cogl-util.h" #error "cogl-config.h must be included before including cogl-util.h"
#endif #endif

2
cogl/configure.ac
View File

@ -673,6 +673,8 @@ AC_SUBST(COGL_EXTRA_LDFLAGS)
MAINTAINER_CFLAGS= MAINTAINER_CFLAGS=
AC_SUBST(MAINTAINER_CFLAGS) AC_SUBST(MAINTAINER_CFLAGS)
AC_DEFINE([COGL_CONFIG_H_INCLUDED], 1, [cogl-config.h was included])
AC_OUTPUT( AC_OUTPUT(
Makefile Makefile
test-fixtures/Makefile test-fixtures/Makefile