[Gnash-commit] /srv/bzr/gnash/trunk r10814: silly things to keep mingw32 happy.

[rob]

------------------------------------------------------------
revno: 10814
committer: address@hidden
branch nick: trunk
timestamp: Mon 2009-04-20 14:10:52 -0600
message:
  silly things to keep mingw32 happy.
modified:
  libbase/getclocktime.hpp
  libbase/log.h
  libbase/utility.h

=== modified file 'libbase/getclocktime.hpp'
--- a/libbase/getclocktime.hpp  2009-02-26 08:04:27 +0000
+++ b/libbase/getclocktime.hpp  2009-04-20 20:10:52 +0000
@@ -30,7 +30,11 @@
 
 #include <sys/time.h>
 
-#ifdef _WIN32
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
+
+#if defined WIN32 && !defined(HAVE_STRUCT_TIMESPEC)
 struct timespec {
        time_t  tv_sec;         /* seconds */
        long    tv_nsec;        /* nanoseconds */

=== modified file 'libbase/log.h'
--- a/libbase/log.h     2009-04-01 14:04:30 +0000
+++ b/libbase/log.h     2009-04-20 20:10:52 +0000
@@ -51,6 +51,12 @@
 # include <boost/preprocessor/repetition/repeat_from_to.hpp>
 # include <boost/preprocessor/seq/for_each.hpp>
 
+// Mingw32 (win32 console) doesn't use the standard GCC defines that
+// Gnash used for debug messages, so make it so...
+#ifndef __FUNCDNAME__
+#define __FUNCDNAME__ __FUNCTION__
+#endif
+
 namespace gnash {
 
 // This is a basic file logging class

=== modified file 'libbase/utility.h'
--- a/libbase/utility.h 2009-03-19 18:47:52 +0000
+++ b/libbase/utility.h 2009-04-20 20:10:52 +0000
@@ -100,7 +100,11 @@
     // static_cast for this as pthread_self() returns a pointer. We can
     // use that too, this ID is only used for the log file to keep output
     // from seperare threads clear.
+# ifdef _WIN32
+    return GetCurrentThreadId();
+#else
     return (unsigned long int)pthread_self();
+#endif
 # endif 
 #else
 # ifdef _WIN32