* m4/ac_attribute.m4:
use newer file from PROTO/autotools * src/lib/dlfcn/dlfcn.c: * src/lib/evil_mman.c: no need to define __UNUSED__ anymore with the new m4 macro * src/lib/Makefile.am: * src/lib/evil.c: remove useless file SVN revision: 36921
This commit is contained in:
parent
67acca9238
commit
0eb2aaab4d
|
|
@ -1,3 +1,16 @@
|
|||
2008-10-21 Vincent Torri <doursse at users dot sf dot net>
|
||||
|
||||
* m4/ac_attribute.m4:
|
||||
use newer file from PROTO/autotools
|
||||
|
||||
* src/lib/dlfcn/dlfcn.c:
|
||||
* src/lib/evil_mman.c:
|
||||
no need to define __UNUSED__ anymore with the new m4 macro
|
||||
|
||||
* src/lib/Makefile.am:
|
||||
* src/lib/evil.c:
|
||||
remove useless file
|
||||
|
||||
2008-10-21 Vincent Torri <doursse at users dot sf dot net>
|
||||
|
||||
* src/lib/Evil.h:
|
||||
|
|
|
|||
|
|
@ -1,14 +1,44 @@
|
|||
dnl Copyright (C) 2008 Vincent Torri <vtorri at univ-evry dot fr>
|
||||
dnl That code is public domain and can be freely used or copied.
|
||||
|
||||
dnl Macro that check if the compiler supports __atribute__
|
||||
|
||||
dnl Usage: AC_C___ATTRIBUTE__
|
||||
dnl call AC_DEFINE for HAVE___ATTRIBUTE__ and __UNUSED__
|
||||
dnl if the compiler supports __attribute__, HAVE___ATTRIBUTE__ is
|
||||
dnl defined to 1 and __UNUSED__ is defined to __attribute__((unused))
|
||||
dnl otherwise, HAVE___ATTRIBUTE__ is not defined and __UNUSED__ is
|
||||
dnl defined to nothing.
|
||||
|
||||
AC_DEFUN([AC_C___ATTRIBUTE__],
|
||||
[
|
||||
AC_MSG_CHECKING(for __attribute__)
|
||||
AC_CACHE_VAL(ac_cv___attribute__, [
|
||||
AC_TRY_COMPILE([#include <stdlib.h>],
|
||||
[int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
|
||||
ac_cv___attribute__=yes, ac_cv___attribute__=no)])
|
||||
if test "$ac_cv___attribute__" = "yes"; then
|
||||
AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has __attribute__])
|
||||
fi
|
||||
AC_MSG_RESULT($ac_cv___attribute__)
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING([for __attribute__])
|
||||
|
||||
AC_CACHE_VAL([ac_cv___attribute__],
|
||||
[AC_TRY_COMPILE(
|
||||
[
|
||||
#include <stdlib.h>
|
||||
],
|
||||
[
|
||||
int func(int x);
|
||||
int foo(int x __attribute__ ((unused)))
|
||||
{
|
||||
exit(1);
|
||||
}
|
||||
],
|
||||
[ac_cv___attribute__="yes"],
|
||||
[ac_cv___attribute__="no"]
|
||||
)]
|
||||
)
|
||||
|
||||
AC_MSG_RESULT($ac_cv___attribute__)
|
||||
|
||||
if test "x${ac_cv___attribute__}" = "xyes" ; then
|
||||
AC_DEFINE([HAVE___ATTRIBUTE__], [1], [Define to 1 if your compiler has __attribute__])
|
||||
AC_DEFINE([__UNUSED__], [__attribute__((unused))], [Define to __attribute__((unused)) if your compiler has __attribute__])
|
||||
else
|
||||
AC_DEFINE([__UNUSED__], [], [Define to nothing if your compiler does not support __attribute__])
|
||||
fi
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ nobase_include_HEADERS += fnmatch.h errno.h
|
|||
endif
|
||||
|
||||
libevil_la_SOURCES = \
|
||||
evil.c \
|
||||
evil_errno.c \
|
||||
evil_fcntl.c \
|
||||
evil_fnmatch.c \
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#if defined(__CEGCC__) || defined(__MINGW32CE__)
|
||||
# include <limits.h>
|
||||
#endif /* __MINGW32CE__ */
|
||||
#endif /* __CEGCC__ || __MINGW32CE__ */
|
||||
|
||||
#include "../Evil.h"
|
||||
|
||||
|
|
@ -12,12 +12,6 @@
|
|||
|
||||
#include "dlfcn.h"
|
||||
|
||||
#if HAVE___ATTRIBUTE__
|
||||
# define __UNUSED__ __attribute__((unused))
|
||||
#else
|
||||
# define __UNUSED__
|
||||
#endif /* HAVE___ATTRIBUTE__ */
|
||||
|
||||
|
||||
static char *dl_err = NULL;
|
||||
static int dl_err_viewed = 0;
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
/* #define WIN32_LEAN_AND_MEAN */
|
||||
/* #include <winsock2.h> */
|
||||
/* #undef WIN32_LEAN_AND_MEAN */
|
||||
|
||||
/* #include <stdlib.h> */
|
||||
/* #include <stdio.h> */
|
||||
|
||||
/* #ifndef __CEGCC__ */
|
||||
/* # include <errno.h> */
|
||||
/* # include <sys/locking.h> */
|
||||
/* # include <io.h> */
|
||||
/* # include <shlobj.h> */
|
||||
/* # include <objidl.h> */
|
||||
/* #else */
|
||||
/* # include <sys/syslimits.h> */
|
||||
/* #endif /\* __CEGCC__ *\/ */
|
||||
|
||||
/* #ifdef UNICODE */
|
||||
/* # include <wchar.h> */
|
||||
/* #endif /\* UNICODE *\/ */
|
||||
|
||||
/* #include <sys/types.h> */
|
||||
/* #include <sys/timeb.h> */
|
||||
/* #include <fcntl.h> */
|
||||
/* #include <sys/stat.h> */
|
||||
|
||||
/* #ifdef HAVE_CONFIG_H */
|
||||
/* # include "config.h" */
|
||||
/* #endif /\* HAVE_CONFIG_H *\/ */
|
||||
|
||||
/* #if HAVE___ATTRIBUTE__ */
|
||||
/* # define __UNUSED__ __attribute__((unused)) */
|
||||
/* #else */
|
||||
/* # define __UNUSED__ */
|
||||
/* #endif /\* HAVE___ATTRIBUTE__ *\/ */
|
||||
|
||||
/* #include "Evil.h" */
|
||||
|
||||
|
|
@ -16,12 +16,6 @@
|
|||
|
||||
#include "sys/mman.h"
|
||||
|
||||
#if HAVE___ATTRIBUTE__
|
||||
# define __UNUSED__ __attribute__((unused))
|
||||
#else
|
||||
# define __UNUSED__
|
||||
#endif /* HAVE___ATTRIBUTE__ */
|
||||
|
||||
#if defined(__CEGCC__)
|
||||
# define _get_osfhandle get_osfhandle
|
||||
# elif defined (__MINGW32CE__)
|
||||
|
|
|
|||
Loading…
Reference in New Issue