Merge branch 'master' into genete_setup_dialog

[synfig.git] / ETL / trunk / ETL / handle

diff --git a/ETL/trunk/ETL/handle b/ETL/trunk/ETL/handle
index 60f2623..d5ef74a 100644 (file)
--- a/ETL/trunk/ETL/handle
+++ b/ETL/trunk/ETL/handle
@@ -23,8 +23,8 @@
 
 /* === S T A R T =========================================================== */
 
-#ifndef __HANDLE__
-#define __HANDLE__
+#ifndef __ETL__HANDLE__
+#define __ETL__HANDLE__
 
 /* === H E A D E R S ======================================================= */
 
@@ -33,12 +33,12 @@
 // include the next line in an attempt to increase stability
 // it seems to make things much *less* stable on MS Windows
 #ifndef _WIN32
-#ifdef HAVE_LIBPTHREAD
-#define ETL_LOCK_REFCOUNTS
+#ifdef __ETL_HAS_LIBPTHREAD
+#define __ETL_LOCK_REFCOUNTS
 #endif
 #endif
 
-#ifdef ETL_LOCK_REFCOUNTS
+#ifdef __ETL_LOCK_REFCOUNTS
 #  include "mutex"
 #endif