From 0eb2aaab4dafb49b761574d88b637ef2857d2927 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Tue, 21 Oct 2008 11:01:36 +0000 Subject: [PATCH] * 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 --- legacy/evil/ChangeLog | 13 ++++++++ legacy/evil/m4/ac_attribute.m4 | 50 ++++++++++++++++++++++++------- legacy/evil/src/lib/Makefile.am | 1 - legacy/evil/src/lib/dlfcn/dlfcn.c | 8 +---- legacy/evil/src/lib/evil.c | 38 ----------------------- legacy/evil/src/lib/evil_mman.c | 6 ---- 6 files changed, 54 insertions(+), 62 deletions(-) delete mode 100644 legacy/evil/src/lib/evil.c diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog index 0586a34ba9..fe900d941c 100644 --- a/legacy/evil/ChangeLog +++ b/legacy/evil/ChangeLog @@ -1,3 +1,16 @@ +2008-10-21 Vincent Torri + + * 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 * src/lib/Evil.h: diff --git a/legacy/evil/m4/ac_attribute.m4 b/legacy/evil/m4/ac_attribute.m4 index 46c1a42291..e0df55d985 100755 --- a/legacy/evil/m4/ac_attribute.m4 +++ b/legacy/evil/m4/ac_attribute.m4 @@ -1,14 +1,44 @@ +dnl Copyright (C) 2008 Vincent Torri +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 ], - [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 + ], + [ +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 + +]) diff --git a/legacy/evil/src/lib/Makefile.am b/legacy/evil/src/lib/Makefile.am index ef542caddc..f564d81c54 100644 --- a/legacy/evil/src/lib/Makefile.am +++ b/legacy/evil/src/lib/Makefile.am @@ -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 \ diff --git a/legacy/evil/src/lib/dlfcn/dlfcn.c b/legacy/evil/src/lib/dlfcn/dlfcn.c index a6e00c3738..0dcc765623 100644 --- a/legacy/evil/src/lib/dlfcn/dlfcn.c +++ b/legacy/evil/src/lib/dlfcn/dlfcn.c @@ -2,7 +2,7 @@ #if defined(__CEGCC__) || defined(__MINGW32CE__) # include -#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; diff --git a/legacy/evil/src/lib/evil.c b/legacy/evil/src/lib/evil.c deleted file mode 100644 index 422b65a7c4..0000000000 --- a/legacy/evil/src/lib/evil.c +++ /dev/null @@ -1,38 +0,0 @@ -/* #define WIN32_LEAN_AND_MEAN */ -/* #include */ -/* #undef WIN32_LEAN_AND_MEAN */ - -/* #include */ -/* #include */ - -/* #ifndef __CEGCC__ */ -/* # include */ -/* # include */ -/* # include */ -/* # include */ -/* # include */ -/* #else */ -/* # include */ -/* #endif /\* __CEGCC__ *\/ */ - -/* #ifdef UNICODE */ -/* # include */ -/* #endif /\* UNICODE *\/ */ - -/* #include */ -/* #include */ -/* #include */ -/* #include */ - -/* #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" */ - diff --git a/legacy/evil/src/lib/evil_mman.c b/legacy/evil/src/lib/evil_mman.c index 313e185c2e..424cdfa731 100644 --- a/legacy/evil/src/lib/evil_mman.c +++ b/legacy/evil/src/lib/evil_mman.c @@ -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__)