From 08cd36dadb108ebce8ce2166e4b647d185961992 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 5 Jul 2011 22:05:54 +0000 Subject: [PATCH] 2011-07-06 00:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/gtwin/gtwin.c ! using HB_ prefixed name for locally defined CONSOLE_SCREEN_BUFFER_INFOEX structure related names and then these are mapped to Windows names using #define (untested) ! disabled whole above logic since it's not used currently anyway. this should fix compilation with mingw64-tdm and some other mingw64 builds with Windows headers featuring CONSOLE_SCREEN_BUFFER_INFOEX structure ; review me please --- harbour/ChangeLog | 12 ++++++++++++ harbour/src/rtl/gtwin/gtwin.c | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index bdd3d1d372..559f0d3276 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2011-07-06 00:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * src/rtl/gtwin/gtwin.c + ! using HB_ prefixed name for locally defined + CONSOLE_SCREEN_BUFFER_INFOEX structure related names + and then these are mapped to Windows names using #define + (untested) + ! disabled whole above logic since it's not used currently + anyway. this should fix compilation with mingw64-tdm + and some other mingw64 builds with Windows headers + featuring CONSOLE_SCREEN_BUFFER_INFOEX structure + ; review me please + 2011-07-05 22:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp * deleted empty lines and commented bad code diff --git a/harbour/src/rtl/gtwin/gtwin.c b/harbour/src/rtl/gtwin/gtwin.c index f7ea4c2d89..57955dca61 100644 --- a/harbour/src/rtl/gtwin/gtwin.c +++ b/harbour/src/rtl/gtwin/gtwin.c @@ -107,6 +107,7 @@ # define HB_GTWIN_USE_SETCONSOLEMENUCLOSE /* Enable undocumented Windows API function call */ #endif +#if 0 #if ( defined( NTDDI_VERSION ) && ( ( defined( NTDDI_VISTA ) && NTDDI_VERSION >= NTDDI_VISTA ) || \ ( defined( NTDDI_LONGHORN ) && NTDDI_VERSION >= NTDDI_LONGHORN ) ) ) && ! defined( __POCC__ ) # if !defined( HB_GTWIN_USE_PCONSOLEINFOEX ) @@ -114,7 +115,7 @@ # endif #else # if ! defined( __WATCOMC__ ) || ( __WATCOMC__ < 1280 ) - typedef struct _CONSOLE_SCREEN_BUFFER_INFOEX + typedef struct _HB_CONSOLE_SCREEN_BUFFER_INFOEX { ULONG cbSize; COORD dwSize; @@ -125,12 +126,15 @@ WORD wPopupAttributes; BOOL bFullscreenSupported; COLORREF ColorTable[ 16 ]; - } CONSOLE_SCREEN_BUFFER_INFOEX, * PCONSOLE_SCREEN_BUFFER_INFOEX; + } HB_CONSOLE_SCREEN_BUFFER_INFOEX, * HB_PCONSOLE_SCREEN_BUFFER_INFOEX; + #define CONSOLE_SCREEN_BUFFER_INFOEX HB_CONSOLE_SCREEN_BUFFER_INFOEX + #define PCONSOLE_SCREEN_BUFFER_INFOEX HB_PCONSOLE_SCREEN_BUFFER_INFOEX # endif # if !defined( HB_GTWIN_USE_PCONSOLEINFOEX ) # define HB_GTWIN_USE_PCONSOLEINFOEX # endif #endif +#endif #undef HB_GTWIN_USE_PCONSOLEINFOEX