[Loki-lib-cvs] SF.net SVN: loki-lib:[950] trunk

[<syn...@us...>]

Revision: 950
          http://loki-lib.svn.sourceforge.net/loki-lib/?rev=950&view=rev
Author:   syntheticpp
Date:     2009-01-26 19:45:54 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
Cygwin fixes: build with mingw 3.4.4 and 4.3.2

Modified Paths:
--------------
    trunk/include/loki/CachedFactory.h
    trunk/src/LevelMutex.cpp
    trunk/src/Makefile

Modified: trunk/include/loki/CachedFactory.h
===================================================================
--- trunk/include/loki/CachedFactory.h	2009-01-26 02:04:40 UTC (rev 949)
+++ trunk/include/loki/CachedFactory.h	2009-01-26 19:45:54 UTC (rev 950)
@@ -37,7 +37,7 @@
 	#define D( x ) ;
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER)  || defined(__CYGWIN__)
 #include <time.h>
 #endif
 

Modified: trunk/src/LevelMutex.cpp
===================================================================
--- trunk/src/LevelMutex.cpp	2009-01-26 02:04:40 UTC (rev 949)
+++ trunk/src/LevelMutex.cpp	2009-01-26 19:45:54 UTC (rev 950)
@@ -20,6 +20,8 @@
 
 // ----------------------------------------------------------------------------
 
+#if !defined(__CYGWIN__) || (defined(__CYGWIN__) && __GNUC__ > 3)
+
 #include <loki/LevelMutex.h>
 
 #include <algorithm>
@@ -1148,3 +1150,7 @@
 // ----------------------------------------------------------------------------
 
 } // end namespace Loki
+
+
+#endif
+

Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2009-01-26 02:04:40 UTC (rev 949)
+++ trunk/src/Makefile	2009-01-26 19:45:54 UTC (rev 950)
@@ -31,6 +31,7 @@
   SHARED_LIB_VERSIONED := libloki.so.$(VERSION)
   override LDFLAGS += --shared -Wl,-soname=$(SHARED_LIB_VERSIONED) -fPIC
   LDLIBS := -lpthread
+else
 ifeq ($(OS), HP-UX)
   SHARED_LIB_BASE := libloki.so
   SHARED_LIB_VERSIONED := libloki.so.$(VERSION)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.