X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2Fclock;h=73ec6eac85baade7a2b0eeeb45ce9621e57fd746;hb=3ff4f5ed21761e28999d5e355c3fafe95cfd081b;hp=54d2cebe781f506eddbb54677fae6180e83c8e1d;hpb=29bc5853be7221a692fe89d9f0ddbd1de7f50299;p=synfig.git

diff --git a/ETL/trunk/ETL/clock b/ETL/trunk/ETL/clock
index 54d2ceb..73ec6ea 100644
--- a/ETL/trunk/ETL/clock
+++ b/ETL/trunk/ETL/clock
@@ -2,7 +2,7 @@
 /*! ========================================================================
 ** Extended Template and Library
 ** Clock Abstraction
-** $Id: clock,v 1.1.1.1 2005/01/04 01:31:46 darco Exp $
+** $Id$
 **
 ** Copyright (c) 2002 Robert B. Quattlebaum Jr.
 **
@@ -22,14 +22,14 @@
 
 /* === S T A R T =========================================================== */
 
-#ifndef __CLOCK__
-#define __CLOCK__
+#ifndef __ETL__CLOCK__
+#define __ETL__CLOCK__
 
 /* === H E A D E R S ======================================================= */
 
 #include "etl_config.h"
 
-#ifdef HAVE_GETTIMEOFDAY
+#ifdef __ETL_HAS_GETTIMEOFDAY
 #include "_clock_gettimeofday.h"
 #ifndef ETL_CLOCK_DEFAULT_DESC_CLASS
 #define ETL_CLOCK_DEFAULT_DESC_CLASS	_ETL::clock_desc_gettimeofday
@@ -49,9 +49,9 @@
 #endif
 #endif
 
-// If we could not find outselves a better
+// If we could not find ourselves a better
 // clock description, go ahead and use the
-// standard clock() implementation. 
+// standard clock() implementation.
 // (Better than nothing...)
 #include "_clock_system.h"
 #ifndef ETL_CLOCK_DEFAULT_DESC_CLASS
@@ -80,7 +80,7 @@ _ETL_BEGIN_NAMESPACE
 	#else
 		#warning No realtime clock description found.
 	#endif
-	
+
 #else
 	class clock : public _ETL::clock_base<ETL_CLOCK_DEFAULT_DESC_CLASS> { };
 	#ifdef ETL_CLOCK_PROCTIME_DESC_CLASS