Mercurial > octave-libgccjit
changeset 9233:b935bbfab7c4
Exclude pthread.h inclusion under Win32
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Thu, 21 May 2009 20:54:11 +0100 |
| parents | 7319e4de9e44 |
| children | e2f6dcade4c6 |
| files | liboctave/ChangeLog liboctave/oct-mutex.cc |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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