Eina: backport rev. 77445

SVN revision: 77446

5 files changed, 16 insertions, 34 deletions

diff --git a/src/lib/eina/eina_inline_lock_posix.x b/src/lib/eina/eina_inline_lock_posix.x
index 64e049a193..86cf1f7a7e 100644
--- a/src/lib/eina/eina_inline_lock_posix.x
+++ b/src/lib/eina/eina_inline_lock_posix.x
@@ -19,15 +19,6 @@
 #ifndef EINA_INLINE_LOCK_POSIX_X_
 #define EINA_INLINE_LOCK_POSIX_X_
 
-#ifdef EINA_UNUSED
-# undef EINA_UNUSED
-#endif
-#ifdef __GNUC__
-# define EINA_UNUSED __attribute__((unused))
-#else
-# define EINA_UNUSED
-#endif
-
 #include <errno.h>
 #ifndef __USE_UNIX98
 # define __USE_UNIX98
diff --git a/src/lib/eina/eina_inline_lock_void.x b/src/lib/eina/eina_inline_lock_void.x
index 9a0465e815..1d1b5d4647 100644
--- a/src/lib/eina/eina_inline_lock_void.x
+++ b/src/lib/eina/eina_inline_lock_void.x
@@ -19,15 +19,6 @@
 #ifndef EINA_INLINE_LOCK_VOID_X_
 #define EINA_INLINE_LOCK_VOID_X_
 
-#ifdef EINA_UNUSED
-# undef EINA_UNUSED
-#endif
-#ifdef __GNUC__
-# define EINA_UNUSED __attribute__((unused))
-#else
-# define EINA_UNUSED
-#endif
-
 /**
  * @addtogroup Eina_Lock_Group Lock
  *
diff --git a/src/lib/eina/eina_inline_lock_win32.x b/src/lib/eina/eina_inline_lock_win32.x
index 56f0ce4acc..856f97265e 100644
--- a/src/lib/eina/eina_inline_lock_win32.x
+++ b/src/lib/eina/eina_inline_lock_win32.x
@@ -19,16 +19,11 @@
 #ifndef EINA_INLINE_LOCK_WIN32_X_
 #define EINA_INLINE_LOCK_WIN32_X_
 
-#ifdef EINA_UNUSED
-# undef EINA_UNUSED
+#ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
 #endif
-#ifdef __GNUC__
-# define EINA_UNUSED __attribute__((unused))
-#else
-# define EINA_UNUSED
-#endif
-
 #include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
 
 typedef CRITICAL_SECTION       Eina_Lock;
 typedef struct _Eina_Condition Eina_Condition;
diff --git a/src/lib/eina/eina_inline_lock_wince.x b/src/lib/eina/eina_inline_lock_wince.x
index 1af1aac406..38d7e08910 100644
--- a/src/lib/eina/eina_inline_lock_wince.x
+++ b/src/lib/eina/eina_inline_lock_wince.x
@@ -19,16 +19,11 @@
 #ifndef EINA_INLINE_LOCK_WIN32_X_
 #define EINA_INLINE_LOCK_WIN32_X_
 
-#ifdef EINA_UNUSED
-# undef EINA_UNUSED
+#ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
 #endif
-#ifdef __GNUC__
-# define EINA_UNUSED __attribute__((unused))
-#else
-# define EINA_UNUSED
-#endif
-
 #include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
 
 EAPI extern Eina_Bool _threads_activated;
 
diff --git a/src/lib/eina/eina_types.h b/src/lib/eina/eina_types.h
index 49eae1dcdd..9e3a6f1537 100644
--- a/src/lib/eina/eina_types.h
+++ b/src/lib/eina/eina_types.h
@@ -63,6 +63,9 @@
 
 #include "eina_config.h"
 
+#ifdef EINA_UNUSED
+# undef EINA_UNUSED
+#endif
 #ifdef EINA_WARN_UNUSED_RESULT
 # undef EINA_WARN_UNUSED_RESULT
 #endif
@@ -104,6 +107,13 @@
 #endif
 
 #ifdef __GNUC__
+
+# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+#  define EINA_UNUSED __attribute__ ((__unused__))
+# else
+#  define EINA_UNUSED
+# endif
+
 # if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
 #  define EINA_WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__))
 # else