From bb3c3ac5bf0c255580f41fb64fbebe9478888bfe Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 22 Jun 2008 19:22:10 +0000 Subject: [PATCH] 2008-06-22 21:20 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbw32/w32_ole.c * contrib/hbole/ole2.c * contrib/gtwvg/gtwvg.h ! HB_ID_REF() declaration changed to compile with MSVS2008 in AMD64. Przemek please verify me. ; With this, all 64bit contrib errors are fixed. [TOMERGE 1.0.0RC1] --- harbour/ChangeLog | 10 ++++++++++ harbour/contrib/gtwvg/gtwvg.h | 3 +-- harbour/contrib/hbole/ole2.c | 3 +-- harbour/contrib/hbw32/w32_ole.c | 3 +-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index efde267d67..e31175fd2e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,16 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-22 21:20 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbw32/w32_ole.c + * contrib/hbole/ole2.c + * contrib/gtwvg/gtwvg.h + ! HB_ID_REF() declaration changed to compile with MSVS2008 + in AMD64. + Przemek please verify me. + ; With this, all 64bit contrib errors are fixed. + [TOMERGE 1.0.0RC1] + 2008-06-22 21:03 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/hbsetup.h + Added HB_OS_WIN_64 macro to replace _WIN64. diff --git a/harbour/contrib/gtwvg/gtwvg.h b/harbour/contrib/gtwvg/gtwvg.h index 6e1a29b174..5820623827 100644 --- a/harbour/contrib/gtwvg/gtwvg.h +++ b/harbour/contrib/gtwvg/gtwvg.h @@ -176,8 +176,7 @@ #endif #endif -#if defined( __cplusplus ) && !defined( _WIN64 ) && \ - ( defined( __BORLANDC__ ) || defined( _MSC_VER ) ) +#if defined( __cplusplus ) && ( defined( __BORLANDC__ ) || defined( _MSC_VER ) ) # define HB_ID_REF( type, id ) id #else # define HB_ID_REF( type, id ) ( ( type ) &id ) diff --git a/harbour/contrib/hbole/ole2.c b/harbour/contrib/hbole/ole2.c index c7962ce53f..76b577e0cb 100644 --- a/harbour/contrib/hbole/ole2.c +++ b/harbour/contrib/hbole/ole2.c @@ -82,8 +82,7 @@ #define NONAMELESSUNION -#if defined( __cplusplus ) && !defined( _WIN64 ) && \ - ( defined( __BORLANDC__ ) || defined( _MSC_VER ) ) +#if defined( __cplusplus ) && ( defined( __BORLANDC__ ) || defined( _MSC_VER ) ) # define HB_ID_REF( type, id ) id #else # define HB_ID_REF( type, id ) ( ( type ) &id ) diff --git a/harbour/contrib/hbw32/w32_ole.c b/harbour/contrib/hbw32/w32_ole.c index d60855472f..642ff188b2 100644 --- a/harbour/contrib/hbw32/w32_ole.c +++ b/harbour/contrib/hbw32/w32_ole.c @@ -91,8 +91,7 @@ #define HB_LONG_LONG_OFF #endif -#if defined( __cplusplus ) && !defined( HB_OS_WIN_64 ) && \ - ( defined( __BORLANDC__ ) || defined( _MSC_VER ) ) +#if defined( __cplusplus ) && ( defined( __BORLANDC__ ) || defined( _MSC_VER ) ) # define HB_ID_REF( type, id ) id #else # define HB_ID_REF( type, id ) ( ( type ) &id )