branches eina : Fix define EINA_UNUSED for win32 builds

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/eina-1.7@80778 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 5dcf176..2580006 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -373,4 +373,6 @@
 
        * 1.7.3 release
 
+2012-12-12  Nicolas Aguirre
 
+       * Fix define EINA_UNUSED for win32 builds

diff --git a/src/include/eina_inline_lock_win32.x b/src/include/eina_inline_lock_win32.x
index 1988724..56f0ce4 100644 (file)
--- a/src/include/eina_inline_lock_win32.x
+++ b/src/include/eina_inline_lock_win32.x
@@ -19,6 +19,15 @@
 #ifndef EINA_INLINE_LOCK_WIN32_X_
 #define EINA_INLINE_LOCK_WIN32_X_
 
+#ifdef EINA_UNUSED
+# undef EINA_UNUSED
+#endif
+#ifdef __GNUC__
+# define EINA_UNUSED __attribute__((unused))
+#else
+# define EINA_UNUSED
+#endif
+
 #include <windows.h>
 
 typedef CRITICAL_SECTION       Eina_Lock;

diff --git a/src/include/eina_inline_lock_wince.x b/src/include/eina_inline_lock_wince.x
index 1af1aac..1343014 100644 (file)
--- a/src/include/eina_inline_lock_wince.x
+++ b/src/include/eina_inline_lock_wince.x
@@ -16,8 +16,8 @@
  * if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EINA_INLINE_LOCK_WIN32_X_
-#define EINA_INLINE_LOCK_WIN32_X_
+#ifndef EINA_INLINE_LOCK_WINCE_X_
+#define EINA_INLINE_LOCK_WINCE_X_
 
 #ifdef EINA_UNUSED
 # undef EINA_UNUSED