summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-10-04 17:16:18 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-10-04 17:16:18 +0000
commit1c96844922935e8f03175d627c8003b2a2b4f7ee (patch)
treede72c9c8e9bfe25f0957215fddb2e5dfdcc57254 /src
parent607eb7d0ded40e50eb7f61a5807160dd0c088afc (diff)
Eina: backport rev. 77445
SVN revision: 77446
Diffstat (limited to 'src')
-rw-r--r--src/lib/eina/eina_inline_lock_posix.x9
-rw-r--r--src/lib/eina/eina_inline_lock_void.x9
-rw-r--r--src/lib/eina/eina_inline_lock_win32.x11
-rw-r--r--src/lib/eina/eina_inline_lock_wince.x11
-rw-r--r--src/lib/eina/eina_types.h10
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 @@
19#ifndef EINA_INLINE_LOCK_POSIX_X_ 19#ifndef EINA_INLINE_LOCK_POSIX_X_
20#define EINA_INLINE_LOCK_POSIX_X_ 20#define EINA_INLINE_LOCK_POSIX_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
31#include <errno.h> 22#include <errno.h>
32#ifndef __USE_UNIX98 23#ifndef __USE_UNIX98
33# define __USE_UNIX98 24# 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 @@
19#ifndef EINA_INLINE_LOCK_VOID_X_ 19#ifndef EINA_INLINE_LOCK_VOID_X_
20#define EINA_INLINE_LOCK_VOID_X_ 20#define EINA_INLINE_LOCK_VOID_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
31/** 22/**
32 * @addtogroup Eina_Lock_Group Lock 23 * @addtogroup Eina_Lock_Group Lock
33 * 24 *
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 @@
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 22#ifndef WIN32_LEAN_AND_MEAN
23# undef EINA_UNUSED 23# define WIN32_LEAN_AND_MEAN
24#endif 24#endif
25#ifdef __GNUC__
26# define EINA_UNUSED __attribute__((unused))
27#else
28# define EINA_UNUSED
29#endif
30
31#include <windows.h> 25#include <windows.h>
26#undef WIN32_LEAN_AND_MEAN
32 27
33typedef CRITICAL_SECTION Eina_Lock; 28typedef CRITICAL_SECTION Eina_Lock;
34typedef struct _Eina_Condition Eina_Condition; 29typedef 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 @@
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 22#ifndef WIN32_LEAN_AND_MEAN
23# undef EINA_UNUSED 23# define WIN32_LEAN_AND_MEAN
24#endif 24#endif
25#ifdef __GNUC__
26# define EINA_UNUSED __attribute__((unused))
27#else
28# define EINA_UNUSED
29#endif
30
31#include <windows.h> 25#include <windows.h>
26#undef WIN32_LEAN_AND_MEAN
32 27
33EAPI extern Eina_Bool _threads_activated; 28EAPI extern Eina_Bool _threads_activated;
34 29
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 @@
63 63
64#include "eina_config.h" 64#include "eina_config.h"
65 65
66#ifdef EINA_UNUSED
67# undef EINA_UNUSED
68#endif
66#ifdef EINA_WARN_UNUSED_RESULT 69#ifdef EINA_WARN_UNUSED_RESULT
67# undef EINA_WARN_UNUSED_RESULT 70# undef EINA_WARN_UNUSED_RESULT
68#endif 71#endif
@@ -104,6 +107,13 @@
104#endif 107#endif
105 108
106#ifdef __GNUC__ 109#ifdef __GNUC__
110
111# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
112# define EINA_UNUSED __attribute__ ((__unused__))
113# else
114# define EINA_UNUSED
115# endif
116
107# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) 117# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
108# define EINA_WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__)) 118# define EINA_WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__))
109# else 119# else