diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 36ada26cf2..9ec10f32de 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-07-11 18:20 UTC+0200 JF Lefebvre (MAFACT) (jfl/at/mafact.com)
+  * harbour/source/common/hbver.c
+    * protected by a #define the use of the new structure OSVERSIONINFOEXA, not know by MSVC 6 (_MSC_VER < 1400)
+
+  * harbour/source/rtl/gtwvt/gtwvt.c
+    * Change LONG_PTR to LONG as LONG_PTR was unknow by MSVC compiler and finally the expected type for SetWindowLongPtr() is LONG.
+    * protected by a #define the call to SetWindowLongPtr(), not know by MSVC 6 (_MSC_VER < 1400)
+    * not tested as working, just compile ok  !!!
+
+
 2008-07-11 17:33 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/dbedit.ch
   * harbour/source/rtl/dbedit.prg
diff --git a/harbour/source/common/hbver.c b/harbour/source/common/hbver.c
index 9a46e4de44..f8d6dbf34a 100644
--- a/harbour/source/common/hbver.c
+++ b/harbour/source/common/hbver.c
@@ -223,6 +223,9 @@ char * hb_verPlatform( void )
                if( osVer.dwMajorVersion == 6 )
                {
 #if !defined(HB_WINCE)
+ #if defined(_MSC_VER)
+  #if (_MSC_VER >= 1400)
+
                   OSVERSIONINFOEXA osVerEx;
 
                   osVerEx.dwOSVersionInfoSize = sizeof( osVerEx );
@@ -235,6 +238,8 @@ char * hb_verPlatform( void )
                         pszName = "Windows Server 2008";
                   }
                   else
+  #endif
+ #endif
 #endif
                      pszName = "Windows";
                }
diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c
index 5493b31784..3c27fe029a 100644
--- a/harbour/source/rtl/gtwvt/gtwvt.c
+++ b/harbour/source/rtl/gtwvt/gtwvt.c
@@ -1445,7 +1445,13 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
             pWVT->bMaximized = FALSE;
 
             /* Enable "maximize" button */
+            
+#if defined(_MSC_VER) and (_MSC_VER <= 1200)
             SetWindowLongPtr( pWVT->hWnd, GWL_STYLE, WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_THICKFRAME );
+#elif
+            SetWindowLong( pWVT->hWnd, GWL_STYLE, WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_THICKFRAME );
+#endif          
+  
             SetWindowPos( pWVT->hWnd, NULL, 0, 0, 0, 0,
                                       SWP_NOACTIVATE | SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_DEFERERASE );
             ShowWindow( pWVT->hWnd, SW_HIDE );
@@ -2162,7 +2168,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
             BOOL bNewValue = hb_itemGetL( pInfo->pNewVal );
             if( bNewValue != pWVT->bResizable )
             {
-               LONG_PTR style;
+               LONG style;
 
                pWVT->bResizable = bNewValue;
 
@@ -2171,7 +2177,12 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
                else
                   style = WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_BORDER;
 
+#if defined(_MSC_VER) and (_MSC_VER <= 1200)
+               SetWindowLong( pWVT->hWnd, GWL_STYLE, style );
+#elif
                SetWindowLongPtr( pWVT->hWnd, GWL_STYLE, style );
+#endif
+               
                SetWindowPos( pWVT->hWnd, NULL, 0, 0, 0, 0,
                                          SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_DEFERERASE );
                ShowWindow( pWVT->hWnd, SW_HIDE );