From 2f99a667e8a1dbd40196d341ebb09952b19d8e17 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 19 Jul 2010 21:19:40 +0000 Subject: [PATCH] 2010-07-19 23:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/hbsocket.c * include/hbthread.h ! Fix for two cygwin build breakers. --- harbour/ChangeLog | 5 +++++ harbour/include/hbthread.h | 9 +++++---- harbour/src/rtl/hbsocket.c | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4f7f02e49a..ba10f71579 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-19 23:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * src/rtl/hbsocket.c + * include/hbthread.h + ! Fix for two cygwin build breakers. + 2010-07-19 21:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/make.hbs * contrib/hbpre.hbm diff --git a/harbour/include/hbthread.h b/harbour/include/hbthread.h index 740f5bf09d..4a6fe9f36d 100644 --- a/harbour/include/hbthread.h +++ b/harbour/include/hbthread.h @@ -184,10 +184,11 @@ HB_EXTERN_BEGIN typedef CRITICAL_SECTION HB_RAWCRITICAL_T; typedef HANDLE HB_OSCOND_T; -# if defined( HB_OS_WIN_CE ) && \ - ( ( defined( __MINGW32CE__ ) && !defined( __MSVCRT__ ) ) || \ - defined( __POCC__ ) ) || \ - ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) +# if ( defined( HB_OS_WIN_CE ) && \ + ( ( defined( __MINGW32CE__ ) && !defined( __MSVCRT__ ) ) || \ + defined( __POCC__ ) ) || \ + ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) ) || \ + defined( __CYGWIN__ ) # define HB_THREAD_RAWWINAPI # endif diff --git a/harbour/src/rtl/hbsocket.c b/harbour/src/rtl/hbsocket.c index 0556ceee99..0c4f06def0 100644 --- a/harbour/src/rtl/hbsocket.c +++ b/harbour/src/rtl/hbsocket.c @@ -186,7 +186,7 @@ #endif -#if defined( HB_OS_WIN ) && ! defined( HB_OS_UNIX ) +#if defined( HB_OS_WIN ) && ! defined( __CYGWIN__ ) # include # include #else