summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-11-23 14:43:06 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-11-28 17:47:12 +0900
commit1d89951626842d95ee9d6817b681101aff5c2b0e (patch)
treec691d0e34dbc8ed67a90c83e26e28d76db538821
parente23ea711ab1d9a37141cd2a317cf14984f5097fa (diff)
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.
-rw-r--r--src/lib/evas/Evas.hh2
-rw-r--r--src/tests/evas_cxx/cxx_compile_test.cc8
2 files changed, 1 insertions, 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 @@
1#ifndef EVAS_HH 1#ifndef EVAS_HH
2#define EVAS_HH 2#define EVAS_HH
3 3
4#if defined(EVAS_H) 4#if defined(_EVAS_H)
5#error "Do not include Evas C API headers before including Evas.hh" 5#error "Do not include Evas C API headers before including Evas.hh"
6#endif 6#endif
7 7
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 @@
1
2#ifdef HAVE_CONFIG_H
3# include "config.h"
4#endif
5
6#include <Evas.h>
7#include <Evas.hh> 1#include <Evas.hh>
8 2
9#include <iostream>
10
11int main() 3int main()
12{ 4{
13 return 0; 5 return 0;