projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into zelgadis_master
[synfig.git]
/
ETL
/
trunk
/
ETL
/
_thread.h
diff --git
a/ETL/trunk/ETL/_thread.h
b/ETL/trunk/ETL/_thread.h
index
cb64933
..
8f70be8
100644
(file)
--- a/
ETL/trunk/ETL/_thread.h
+++ b/
ETL/trunk/ETL/_thread.h
@@
-31,21
+31,21
@@
#define __USE_GNU
#define __USE_GNU
-#ifdef
__ETL_HAS
_PTHREAD_H
+#ifdef
HAVE
_PTHREAD_H
# include <pthread.h>
#endif
# include <pthread.h>
#endif
-#ifdef
__ETL_HAS
_SCHED_H
+#ifdef
HAVE
_SCHED_H
# include <sched.h>
#endif
# include <sched.h>
#endif
-#ifdef
__ETL_HAS
_CREATETHREAD
+#ifdef
HAVE
_CREATETHREAD
# include <windows.h>
#endif
/* === M A C R O S ========================================================= */
# include <windows.h>
#endif
/* === M A C R O S ========================================================= */
-#if ( defined (
__ETL_HAS_PTHREAD_CREATE) || defined (__ETL_HAS_CLONE) || defined (__ETL_HAS
_CREATETHREAD) ) && !defined (NO_THREADS)
+#if ( defined (
HAVE_PTHREAD_CREATE) || defined (HAVE_CLONE) || defined (HAVE
_CREATETHREAD) ) && !defined (NO_THREADS)
# define CALLISTO_THREADS
#endif
# define CALLISTO_THREADS
#endif
@@
-53,7
+53,7
@@
/* === C L A S S E S & S T R U C T S ======================================= */
/* === C L A S S E S & S T R U C T S ======================================= */
-#if defined(CALLISTO_THREADS) && defined(
__ETL_HAS
_PTHREAD_CREATE)
+#if defined(CALLISTO_THREADS) && defined(
HAVE
_PTHREAD_CREATE)
static inline void Yield(void)
{
sched_yield();
static inline void Yield(void)
{
sched_yield();
@@
-68,7
+68,7
@@
inline void Yield(void) { }
#ifdef CALLISTO_THREADS
#ifdef CALLISTO_THREADS
-#ifdef
__ETL_HAS
_PTHREAD_CREATE
+#ifdef
HAVE
_PTHREAD_CREATE
class Thread
{
class Thread
{
@@
-207,7
+207,7
@@
public:
}
};
}
};
-#ifdef
__ETL_HAS
_PTHREAD_RW_LOCK_INIT
+#ifdef
HAVE
_PTHREAD_RW_LOCK_INIT
class ReadWriteLock
{
pthread_rwlock_t rwlock;
class ReadWriteLock
{
pthread_rwlock_t rwlock;
@@
-290,8
+290,8
@@
public:
};
*/
};
*/
-#else // if defined
__ETL_HAS_PTHREAD_CREATE
-#ifdef
__ETL_HAS
_CREATETHREAD
+#else // if defined
HAVE_PTHREAD
+#ifdef
HAVE
_CREATETHREAD
#ifdef THREAD_ENTRYPOINT
#ifdef THREAD_ENTRYPOINT
@@
-448,8
+448,8
@@
public:
};
};
-#endif // if defined
__ETL_HAS
_CREATETHREAD
-#endif // if defined
__ETL_HAS
_PTHREAD_CREATE
+#endif // if defined
HAVE
_CREATETHREAD
+#endif // if defined
HAVE
_PTHREAD_CREATE
#endif // if defined CALLISTO_THREADS
#endif // if defined CALLISTO_THREADS