# HG changeset patch
# User Michael Goffioul <michael.goffioul@gmail.com>
# Date 1242935651 -3600
# Node ID b935bbfab7c415b527a5cbe2da7904b56ece5978
# Parent  7319e4de9e446195aaf5b7749cf65a8f4566560d
Exclude pthread.h inclusion under Win32

diff -r 7319e4de9e44 -r b935bbfab7c4 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Thu May 21 20:48:37 2009 +0100
+++ b/liboctave/ChangeLog	Thu May 21 20:54:11 2009 +0100
@@ -1,5 +1,7 @@
 2009-05-21  Michael Goffioul  <michael.goffioul@gmail.com>
 
+	* oct-mutex.cc: Exclude pthread.h inclusion under Win32.
+
 	* base-aepbal.h (base_aepbal::operator=): Add missing return
 	statement.
 
diff -r 7319e4de9e44 -r b935bbfab7c4 liboctave/oct-mutex.cc
--- a/liboctave/oct-mutex.cc	Thu May 21 20:48:37 2009 +0100
+++ b/liboctave/oct-mutex.cc	Thu May 21 20:54:11 2009 +0100
@@ -27,12 +27,10 @@
 #include "oct-mutex.h"
 #include "lo-error.h"
 
-#if defined (HAVE_PTHREAD_H)
-#include <pthread.h>
-#endif
-
 #if defined (__WIN32__) && ! defined (__CYGWIN__)
 #include <windows.h>
+#elif defined (HAVE_PTHREAD_H)
+#include <pthread.h>
 #endif
 
 void