Eina: backport rev. 77445

SVN revision: 77446
This commit is contained in:
Vincent Torri 2012-10-04 17:16:18 +00:00
parent 607eb7d0de
commit 1c96844922
5 changed files with 16 additions and 34 deletions

View File

@ -19,15 +19,6 @@
#ifndef EINA_INLINE_LOCK_POSIX_X_
#define EINA_INLINE_LOCK_POSIX_X_
#ifdef EINA_UNUSED
# undef EINA_UNUSED
#endif
#ifdef __GNUC__
# define EINA_UNUSED __attribute__((unused))
#else
# define EINA_UNUSED
#endif
#include <errno.h>
#ifndef __USE_UNIX98
# define __USE_UNIX98

View File

@ -19,15 +19,6 @@
#ifndef EINA_INLINE_LOCK_VOID_X_
#define EINA_INLINE_LOCK_VOID_X_
#ifdef EINA_UNUSED
# undef EINA_UNUSED
#endif
#ifdef __GNUC__
# define EINA_UNUSED __attribute__((unused))
#else
# define EINA_UNUSED
#endif
/**
* @addtogroup Eina_Lock_Group Lock
*

View File

@ -19,16 +19,11 @@
#ifndef EINA_INLINE_LOCK_WIN32_X_
#define EINA_INLINE_LOCK_WIN32_X_
#ifdef EINA_UNUSED
# undef EINA_UNUSED
#ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#ifdef __GNUC__
# define EINA_UNUSED __attribute__((unused))
#else
# define EINA_UNUSED
#endif
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
typedef CRITICAL_SECTION Eina_Lock;
typedef struct _Eina_Condition Eina_Condition;

View File

@ -19,16 +19,11 @@
#ifndef EINA_INLINE_LOCK_WIN32_X_
#define EINA_INLINE_LOCK_WIN32_X_
#ifdef EINA_UNUSED
# undef EINA_UNUSED
#ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#ifdef __GNUC__
# define EINA_UNUSED __attribute__((unused))
#else
# define EINA_UNUSED
#endif
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
EAPI extern Eina_Bool _threads_activated;

View File

@ -63,6 +63,9 @@
#include "eina_config.h"
#ifdef EINA_UNUSED
# undef EINA_UNUSED
#endif
#ifdef EINA_WARN_UNUSED_RESULT
# undef EINA_WARN_UNUSED_RESULT
#endif
@ -104,6 +107,13 @@
#endif
#ifdef __GNUC__
# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
# define EINA_UNUSED __attribute__ ((__unused__))
# else
# define EINA_UNUSED
# endif
# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
# define EINA_WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__))
# else