From f47bb54f4f0960b34050be4342f692f33feedf35 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Thu, 23 Nov 2017 14:43:06 +0900 Subject: [PATCH] cxx: Fix evas compile test and Evas.hh The c++ header was checking the wrong header guard. Fixing that would break the compilation test, as it was doing the wrong thing. Also I think config.h should not be included for compilation tests. This should make things slightly better. --- src/lib/evas/Evas.hh | 2 +- src/tests/evas_cxx/cxx_compile_test.cc | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/lib/evas/Evas.hh b/src/lib/evas/Evas.hh index 893f895ca9..064d8c184e 100644 --- a/src/lib/evas/Evas.hh +++ b/src/lib/evas/Evas.hh @@ -1,7 +1,7 @@ #ifndef EVAS_HH #define EVAS_HH -#if defined(EVAS_H) +#if defined(_EVAS_H) #error "Do not include Evas C API headers before including Evas.hh" #endif diff --git a/src/tests/evas_cxx/cxx_compile_test.cc b/src/tests/evas_cxx/cxx_compile_test.cc index ba354deb78..90527adf25 100644 --- a/src/tests/evas_cxx/cxx_compile_test.cc +++ b/src/tests/evas_cxx/cxx_compile_test.cc @@ -1,13 +1,5 @@ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include #include -#include - int main() { return 0;