X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_thread.h;fp=ETL%2Ftrunk%2FETL%2F_thread.h;h=8f70be8ae7e0f58ea3ed8347fc6b5446962ed763;hb=4cfe2b68ebd2556f9926965dcea2ca8f3fc050ea;hp=cb649336e7fb331a5e7271421910ea02d4b0e482;hpb=697bc5a5331b2750271bb68d401adb329ed7d95e;p=synfig.git

diff --git a/ETL/trunk/ETL/_thread.h b/ETL/trunk/ETL/_thread.h
index cb64933..8f70be8 100644
--- a/ETL/trunk/ETL/_thread.h
+++ b/ETL/trunk/ETL/_thread.h
@@ -31,21 +31,21 @@
 
 #define __USE_GNU
 
-#ifdef __ETL_HAS_PTHREAD_H
+#ifdef HAVE_PTHREAD_H
 # include <pthread.h>
 #endif
 
-#ifdef __ETL_HAS_SCHED_H
+#ifdef HAVE_SCHED_H
 # include <sched.h>
 #endif
 
-#ifdef __ETL_HAS_CREATETHREAD
+#ifdef HAVE_CREATETHREAD
 # 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
 
@@ -53,7 +53,7 @@
 
 /* === 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();
@@ -68,7 +68,7 @@ inline void Yield(void) { }
 
 #ifdef CALLISTO_THREADS
 
-#ifdef __ETL_HAS_PTHREAD_CREATE
+#ifdef HAVE_PTHREAD_CREATE
 
 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;
@@ -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
@@ -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