From 2495880ac033c850c3dfe10bea60ae28377543d2 Mon Sep 17 00:00:00 2001 From: Youness Alaoui Date: Sun, 18 Sep 2011 21:57:02 +0000 Subject: [PATCH] Eina: mmap: Use HAVE_SIGINT_T instead of ifdefs on WIN32 SVN revision: 63461 --- legacy/eina/configure.ac | 8 +++++++- legacy/eina/src/lib/eina_mmap.c | 13 +++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac index 0702be82ab..054c0e9cff 100644 --- a/legacy/eina/configure.ac +++ b/legacy/eina/configure.ac @@ -358,7 +358,7 @@ AC_HEADER_ASSERT AC_HEADER_DIRENT AC_HEADER_TIME EFL_CHECK_PATH_MAX -AC_CHECK_HEADERS([unistd.h libgen.h inttypes.h stdint.h sys/types.h]) +AC_CHECK_HEADERS([unistd.h libgen.h inttypes.h stdint.h sys/types.h siginfo.h]) if test "x${ac_cv_header_inttypes_h}" = "xyes" ; then EINA_CONFIGURE_HAVE_INTTYPES_H="#define EINA_HAVE_INTTYPES_H" @@ -377,6 +377,12 @@ AC_SUBST([EINA_CONFIGURE_HAVE_STDINT_H]) AC_CHECK_SIZEOF([wchar_t]) EINA_SIZEOF_WCHAR_T=$ac_cv_sizeof_wchar_t AC_SUBST([EINA_SIZEOF_WCHAR_T]) +AC_CHECK_TYPES([siginfo_t], [], [], + [[#include + #if HAVE_SIGINFO_H + # include + #endif + ]]) ### Checks for structures diff --git a/legacy/eina/src/lib/eina_mmap.c b/legacy/eina/src/lib/eina_mmap.c index 9a5932e2d7..a226ad2152 100644 --- a/legacy/eina/src/lib/eina_mmap.c +++ b/legacy/eina/src/lib/eina_mmap.c @@ -20,7 +20,7 @@ # include "config.h" #endif -#ifndef _WIN32 +#ifdef HAVE_SIGINFO_T #ifdef STDC_HEADERS # include @@ -41,7 +41,11 @@ #include #include #include -# include +#include + +#if HAVE_SIGINFO_H +# include +#endif #endif @@ -55,7 +59,8 @@ *============================================================================*/ static Eina_Bool mmap_safe = EINA_FALSE; -#ifndef _WIN32 +#ifdef HAVE_SIGINFO_T + static int _eina_mmap_log_dom = -1; static int _eina_mmap_zero_fd = -1; static long _eina_mmap_pagesize = -1; @@ -117,7 +122,7 @@ _eina_mmap_safe_sigbus(int sig __UNUSED__, EAPI Eina_Bool eina_mmap_safety_enabled_set(Eina_Bool enabled) { -#ifdef _WIN32 +#ifndef HAVE_SIGINFO_T return EINA_FALSE; #else if (_eina_mmap_log_dom < 0)