From 1c492ce551eaae59aec4e50b5ee11303f20247a7 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Thu, 17 Feb 2011 08:34:42 +0000 Subject: [PATCH] Better headers check. Btw, should we include inttypes.h where we include stdint.h ? SVN revision: 57114 --- legacy/eina/configure.ac | 11 +++++++++-- legacy/eina/src/lib/eina_hash.c | 7 +++++-- legacy/eina/src/lib/eina_log.c | 2 +- legacy/eina/src/lib/eina_module.c | 4 +--- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac index ec0d4a11ae..b22124e4e9 100644 --- a/legacy/eina/configure.ac +++ b/legacy/eina/configure.ac @@ -330,15 +330,22 @@ fi AC_HEADER_ASSERT AC_HEADER_DIRENT AC_HEADER_TIME +AC_CHECK_HEADERS([unistd.h libgen.h]) EFL_CHECK_PATH_MAX ### Checks for types AC_CHECK_HEADER([inttypes.h], - [EINA_CONFIGURE_HAVE_INTTYPES_H="#define EINA_HAVE_INTTYPES_H"]) + [ + EINA_CONFIGURE_HAVE_INTTYPES_H="#define EINA_HAVE_INTTYPES_H" + AC_DEFINE(HAVE_INTTYPES_H, 1, [Define to 1 if you have the header file.]) + ]) AC_SUBST(EINA_CONFIGURE_HAVE_INTTYPES_H) AC_CHECK_HEADER([stdint.h], - [EINA_CONFIGURE_HAVE_STDINT_H="#define EINA_HAVE_STDINT_H"]) + [ + EINA_CONFIGURE_HAVE_STDINT_H="#define EINA_HAVE_STDINT_H" + AC_DEFINE(HAVE_STDINT_H, 1, [Define to 1 if you have the header file.]) + ]) AC_SUBST(EINA_CONFIGURE_HAVE_STDINT_H) AC_CHECK_SIZEOF(wchar_t) diff --git a/legacy/eina/src/lib/eina_hash.c b/legacy/eina/src/lib/eina_hash.c index 18633e7551..38c6a61c52 100644 --- a/legacy/eina/src/lib/eina_hash.c +++ b/legacy/eina/src/lib/eina_hash.c @@ -24,10 +24,13 @@ #include #include #include + +#ifdef HAVE_STDINT_H +# include +#endif + #ifdef _MSC_VER # include -#else -# include #endif #include "eina_config.h" diff --git a/legacy/eina/src/lib/eina_log.c b/legacy/eina/src/lib/eina_log.c index 79416671bc..5073137ecc 100644 --- a/legacy/eina/src/lib/eina_log.c +++ b/legacy/eina/src/lib/eina_log.c @@ -268,7 +268,7 @@ #include #include -#ifndef _MSC_VER +#ifdef HAVE_UNISTD_H # include #endif diff --git a/legacy/eina/src/lib/eina_module.c b/legacy/eina/src/lib/eina_module.c index e2ca522464..5c46b7a2da 100644 --- a/legacy/eina/src/lib/eina_module.c +++ b/legacy/eina/src/lib/eina_module.c @@ -42,10 +42,8 @@ void *alloca (size_t); #include #include -#ifndef _MSC_VER +#ifdef HAVE_LIBGEN_H # include -#else -# include #endif #include