merge: __UNUSED__ --> EINA_UNUSED and some fixes in eo.

SVN revision: 77542

6 files changed, 19 insertions, 8 deletions

diff --git a/src/lib/evil/dlfcn.c b/src/lib/evil/dlfcn.c
index 818cabf014..a877653ec6 100644
--- a/src/lib/evil/dlfcn.c
+++ b/src/lib/evil/dlfcn.c
@@ -21,6 +21,7 @@
 #endif
 
 #include "Evil.h"
+#include "evil_private.h"
 
 #include "dlfcn.h"
 
@@ -57,7 +58,7 @@ get_last_error(char *desc)
 }
 
 void *
-dlopen(const char* path, int mode __UNUSED__)
+dlopen(const char* path, int mode EVIL_UNUSED)
 {
    HMODULE module = NULL;
 
@@ -190,7 +191,7 @@ dlsym(void *handle, const char *symbol)
 }
 
 int
-dladdr (const void *addr __UNUSED__, Dl_info *info)
+dladdr (const void *addr EVIL_UNUSED, Dl_info *info)
 {
    TCHAR  tpath[PATH_MAX];
    MEMORY_BASIC_INFORMATION mbi;
diff --git a/src/lib/evil/evil_mman.c b/src/lib/evil/evil_mman.c
index 8898357cfc..709eb24fc8 100644
--- a/src/lib/evil/evil_mman.c
+++ b/src/lib/evil/evil_mman.c
@@ -24,6 +24,7 @@
 #include "evil_private.h"
 #define APICHAR char
 #include "evil_print.h"
+#include "evil_private.h"
 
 #ifdef __MINGW32CE__
 # define _get_osfhandle(FILEDES) ((long)FILEDES)
@@ -34,7 +35,7 @@
 
 
 void *
-mmap(void  *addr __UNUSED__,
+mmap(void  *addr EVIL_UNUSED,
      size_t len,
      int    prot,
      int    flags,
@@ -189,7 +190,7 @@ mmap(void  *addr __UNUSED__,
 
 int
 munmap(void  *addr,
-       size_t len __UNUSED__)
+       size_t len EVIL_UNUSED)
 {
 #ifdef _WIN32_WCE
    OSVERSIONINFO os_version;
diff --git a/src/lib/evil/evil_private.h b/src/lib/evil/evil_private.h
index d46a379d01..0f8b6d193e 100644
--- a/src/lib/evil/evil_private.h
+++ b/src/lib/evil/evil_private.h
@@ -6,6 +6,14 @@
 extern "C" {
 #endif
 
+#ifdef __GNUC__
+# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+#  define EVIL_UNUSED __attribute__ ((__unused__))
+# else
+#  define EVIL_UNUSED
+# endif
+#endif
+
 long _evil_systemtime_to_time(SYSTEMTIME st);
 
 void _evil_error_display(const char *fct, LONG res);
diff --git a/src/lib/evil/evil_stdio.c b/src/lib/evil/evil_stdio.c
index 594d281159..1aa6f67537 100644
--- a/src/lib/evil/evil_stdio.c
+++ b/src/lib/evil/evil_stdio.c
@@ -15,7 +15,7 @@
  *
  */
 
-void evil_perror (const char *s __UNUSED__)
+void evil_perror (const char *s EVIL_UNUSED)
 {
    fprintf(stderr, "[Windows CE] error\n");
 }
diff --git a/src/lib/evil/evil_string.c b/src/lib/evil/evil_string.c
index ffbe308b67..491a880e1a 100644
--- a/src/lib/evil/evil_string.c
+++ b/src/lib/evil/evil_string.c
@@ -3,6 +3,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include "Evil.h"
+#include "evil_private.h"
 
 
 #ifdef _WIN32_WCE
@@ -12,7 +13,7 @@
  *
  */
 
-char *strerror (int errnum __UNUSED__)
+char *strerror (int errnum EVIL_UNUSED)
 {
    return "[Windows CE] error\n";
 }
diff --git a/src/lib/evil/evil_unistd.c b/src/lib/evil/evil_unistd.c
index e1498509df..10ef018e1e 100644
--- a/src/lib/evil/evil_unistd.c
+++ b/src/lib/evil/evil_unistd.c
@@ -68,7 +68,7 @@ evil_time_get(void)
 
 #ifdef _MSC_VER
 int
-evil_gettimeofday(struct timeval *tp, void *tzp __UNUSED__)
+evil_gettimeofday(struct timeval *tp, void *tzp EVIL_UNUSED)
 {
    LARGE_INTEGER count;
    LONGLONG      diff;
@@ -423,7 +423,7 @@ evil_pipe(int *fds)
 
 #ifdef _WIN32_WCE
 
-int execvp (const char *file __UNUSED__, char *const argv[] __UNUSED__)
+int execvp (const char *file EVIL_UNUSED, char *const argv[] EVIL_UNUSED)
 {
    return 1;
 }