diff options
| author | Nicolas Aguirre <aguirre.nicolas@gmail.com> | 2012-12-12 22:17:58 +0000 |
|---|---|---|
| committer | Nicolas Aguirre <aguirre.nicolas@gmail.com> | 2012-12-12 22:17:58 +0000 |
| commit | 3aa6328c142d832c0037ec372b6e44cb6738c48b (patch) | |
| tree | 8f139d4f6f8729fc9514ce222caa5cb7e29fcc41 | |
| parent | 4ad4a116c9b2f4b1a39cdd24e5c7ebcf5a74efce (diff) | |
| download | eina-3aa6328c142d832c0037ec372b6e44cb6738c48b.tar.gz | |
branches eina : Fix define EINA_UNUSED for win32 builds
SVN revision: 80778
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/include/eina_inline_lock_win32.x | 9 | ||||
| -rw-r--r-- | src/include/eina_inline_lock_wince.x | 4 |
3 files changed, 13 insertions, 2 deletions
@@ -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 --- 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 --- 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 |