summaryrefslogtreecommitdiff
path: root/src/lib/eina/eina_types.h
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-10-05 20:09:47 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-10-05 20:09:47 +0000
commit7fe3d3599446108bc36a0ab6ec563a267db02733 (patch)
tree8c45e7b3087e289466d4fb4ff99b12b209b770f6 /src/lib/eina/eina_types.h
parent227ef6982edc5e7a31f74077b93e82aeb33d7d6f (diff)
merge: __UNUSED__ --> EINA_UNUSED and some fixes in eo.
SVN revision: 77542
Diffstat (limited to 'src/lib/eina/eina_types.h')
-rw-r--r--src/lib/eina/eina_types.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/lib/eina/eina_types.h b/src/lib/eina/eina_types.h
index 9e3a6f1537..d74d200a32 100644
--- a/src/lib/eina/eina_types.h
+++ b/src/lib/eina/eina_types.h
@@ -164,10 +164,11 @@
164# define EINA_SENTINEL 164# define EINA_SENTINEL
165# endif 165# endif
166 166
167#elif defined(_WIN32) 167#elif defined(_MSC_VER)
168# define EINA_UNUSED
168# define EINA_WARN_UNUSED_RESULT 169# define EINA_WARN_UNUSED_RESULT
169# define EINA_ARG_NONNULL(...) 170# define EINA_ARG_NONNULL(...)
170# if defined(_MSC_VER) && _MSC_VER >= 1300 171# if _MSC_VER >= 1300
171# define EINA_DEPRECATED __declspec(deprecated) 172# define EINA_DEPRECATED __declspec(deprecated)
172# else 173# else
173# define EINA_DEPRECATED 174# define EINA_DEPRECATED
@@ -184,6 +185,7 @@
184# define EINA_SENTINEL 185# define EINA_SENTINEL
185 186
186#elif defined(__SUNPRO_C) 187#elif defined(__SUNPRO_C)
188# define EINA_UNUSED
187# define EINA_WARN_UNUSED_RESULT 189# define EINA_WARN_UNUSED_RESULT
188# define EINA_ARG_NONNULL(...) 190# define EINA_ARG_NONNULL(...)
189# define EINA_DEPRECATED 191# define EINA_DEPRECATED
@@ -207,7 +209,13 @@
207# define EINA_LIKELY(exp) exp 209# define EINA_LIKELY(exp) exp
208# define EINA_SENTINEL 210# define EINA_SENTINEL
209 211
210#else /* ! __GNUC__ && ! _WIN32 && ! __SUNPRO_C */ 212#else /* ! __GNUC__ && ! _MSC_VER && ! __SUNPRO_C */
213
214/**
215 * @def EINA_UNUSED
216 * Used to warn when an argument of the function is not used.
217 */
218# define EINA_UNUSED
211 219
212/** 220/**
213 * @def EINA_WARN_UNUSED_RESULT 221 * @def EINA_WARN_UNUSED_RESULT