From: Enlightenment S. <no-...@en...> - 2011-07-13 08:51:32
|
Log: eina: fix build on NetBSD. NOTE: we need a fallback for shm_open that will work on BSD system. Author: cedric Date: 2011-07-13 01:51:19 -0700 (Wed, 13 Jul 2011) New Revision: 61324 Trac: http://trac.enlightenment.org/e/changeset/61324 Modified: trunk/eina/configure.ac trunk/eina/src/include/eina_inline_lock_posix.x trunk/eina/src/lib/eina_file.c Modified: trunk/eina/configure.ac =================================================================== --- trunk/eina/configure.ac 2011-07-13 07:39:42 UTC (rev 61323) +++ trunk/eina/configure.ac 2011-07-13 08:51:19 UTC (rev 61324) @@ -586,6 +586,8 @@ AC_CHECK_FUNCS([statat], [AC_DEFINE(HAVE_STATAT)], []) AC_CHECK_FUNCS([fpathconf], [AC_DEFINE(HAVE_FPATHCONF)], []) +AC_CHECK_FUNCS([shm_open], [AC_DEFINE(HAVE_SHMOPEN)], []) + ### Modules if test "x${have_default_mempool}" = "xyes" ; then Modified: trunk/eina/src/include/eina_inline_lock_posix.x =================================================================== --- trunk/eina/src/include/eina_inline_lock_posix.x 2011-07-13 07:39:42 UTC (rev 61323) +++ trunk/eina/src/include/eina_inline_lock_posix.x 2011-07-13 08:51:19 UTC (rev 61324) @@ -28,6 +28,8 @@ # include <pthread.h> #endif +#include <sys/time.h> + #ifdef EINA_HAVE_DEBUG_THREADS #include <stdlib.h> #include <string.h> Modified: trunk/eina/src/lib/eina_file.c =================================================================== --- trunk/eina/src/lib/eina_file.c 2011-07-13 07:39:42 UTC (rev 61323) +++ trunk/eina/src/lib/eina_file.c 2011-07-13 08:51:19 UTC (rev 61324) @@ -751,7 +751,11 @@ */ if (shared) +#ifdef HAVE_SHMOPEN fd = shm_open(filename, O_RDONLY, S_IRWXU | S_IRWXG | S_IRWXO); +#else + return NULL; +#endif else fd = open(filename, O_RDONLY, S_IRWXU | S_IRWXG | S_IRWXO); |