summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Aguirre <aguirre.nicolas@gmail.com>2012-12-12 22:17:58 +0000
committerNicolas Aguirre <aguirre.nicolas@gmail.com>2012-12-12 22:17:58 +0000
commit3aa6328c142d832c0037ec372b6e44cb6738c48b (patch)
tree8f139d4f6f8729fc9514ce222caa5cb7e29fcc41
parent4ad4a116c9b2f4b1a39cdd24e5c7ebcf5a74efce (diff)
branches eina : Fix define EINA_UNUSED for win32 builds
SVN revision: 80778
-rw-r--r--ChangeLog2
-rw-r--r--src/include/eina_inline_lock_win32.x9
-rw-r--r--src/include/eina_inline_lock_wince.x4
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dcf176..2580006 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -373,4 +373,6 @@
373 373
374 * 1.7.3 release 374 * 1.7.3 release
375 375
3762012-12-12 Nicolas Aguirre
376 377
378 * 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
--- a/src/include/eina_inline_lock_win32.x
+++ b/src/include/eina_inline_lock_win32.x
@@ -19,6 +19,15 @@
19#ifndef EINA_INLINE_LOCK_WIN32_X_ 19#ifndef EINA_INLINE_LOCK_WIN32_X_
20#define EINA_INLINE_LOCK_WIN32_X_ 20#define EINA_INLINE_LOCK_WIN32_X_
21 21
22#ifdef EINA_UNUSED
23# undef EINA_UNUSED
24#endif
25#ifdef __GNUC__
26# define EINA_UNUSED __attribute__((unused))
27#else
28# define EINA_UNUSED
29#endif
30
22#include <windows.h> 31#include <windows.h>
23 32
24typedef CRITICAL_SECTION Eina_Lock; 33typedef 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
--- a/src/include/eina_inline_lock_wince.x
+++ b/src/include/eina_inline_lock_wince.x
@@ -16,8 +16,8 @@
16 * if not, see <http://www.gnu.org/licenses/>. 16 * if not, see <http://www.gnu.org/licenses/>.
17 */ 17 */
18 18
19#ifndef EINA_INLINE_LOCK_WIN32_X_ 19#ifndef EINA_INLINE_LOCK_WINCE_X_
20#define EINA_INLINE_LOCK_WIN32_X_ 20#define EINA_INLINE_LOCK_WINCE_X_
21 21
22#ifdef EINA_UNUSED 22#ifdef EINA_UNUSED
23# undef EINA_UNUSED 23# undef EINA_UNUSED