From 79072d5798b8d89118a6bfca27a40f8c42d7d98f Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 30 May 2008 07:35:54 +0000
Subject: [PATCH] 2008-05-30 09:29 UTC+0100 Viktor Szakats (harbour.01 syenar
 hu)    * contrib/hbapollo/apollo.c      ! Added __BORLAND__ specific hack to
 suppress numerous        non-ANSI warnings in foreign header.        (#define
 _declspec __declspec)

   * contrib/hbapollo/apollo1.prg
     + File ending CRLF.

   * contrib/hbgd/gdwrp.c
     ! Fixed to explicitly include <windows.h> for __BORLANDC__
       only. The reason for this hack is still unknwown, if
       anyone could help to investigate this, it would be great.
---
 harbour/ChangeLog                    | 14 ++++++++++++++
 harbour/contrib/hbapollo/apollo.c    |  9 ++++++++-
 harbour/contrib/hbapollo/apollo1.prg |  2 +-
 harbour/contrib/hbgd/gdwrp.c         |  5 +++--
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5945b7169b..508bbfe681 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,20 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-05-30 09:29 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+   * contrib/hbapollo/apollo.c
+     ! Added __BORLAND__ specific hack to suppress numerous 
+       non-ANSI warnings in foreign header.
+       (#define _declspec __declspec)
+
+   * contrib/hbapollo/apollo1.prg
+     + File ending CRLF.
+
+   * contrib/hbgd/gdwrp.c
+     ! Fixed to explicitly include <windows.h> for __BORLANDC__ 
+       only. The reason for this hack is still unknwown, if 
+       anyone could help to investigate this, it would be great.
+
 2008-05-30 03:47 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rtl/hbgtcore.c
     * removed unnecessary variable
diff --git a/harbour/contrib/hbapollo/apollo.c b/harbour/contrib/hbapollo/apollo.c
index 46ee84b8b8..4f5fbf7b38 100644
--- a/harbour/contrib/hbapollo/apollo.c
+++ b/harbour/contrib/hbapollo/apollo.c
@@ -51,10 +51,17 @@
  */
 
 /* -----------------29/12/2001 19:23-----------------
- * NOTE: Functions are liste alfabeticly
+ * NOTE: Functions are listed alfabetically
  * --------------------------------------------------*/
 
+/* NOTE: This hack is needed to suppress 'non-ANSI 
+         keyword' warnings inside sde61.h. */
+#if defined( __BORLANDC__ )
+   #define _declspec __declspec
+#endif
+
 #define HB_OS_WIN_32_USED
+
 #define MAX_STR_LEN 255
 
 #include "hbapi.h"
diff --git a/harbour/contrib/hbapollo/apollo1.prg b/harbour/contrib/hbapollo/apollo1.prg
index ac937332ac..860694c580 100644
--- a/harbour/contrib/hbapollo/apollo1.prg
+++ b/harbour/contrib/hbapollo/apollo1.prg
@@ -79,4 +79,4 @@ RETURN Val( sx_Getvariant( x ) )
 /*
 sx_GetVal()
 
-*/
\ No newline at end of file
+*/
diff --git a/harbour/contrib/hbgd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c
index 5bc17f204e..77dca36700 100644
--- a/harbour/contrib/hbgd/gdwrp.c
+++ b/harbour/contrib/hbgd/gdwrp.c
@@ -52,8 +52,9 @@
 
 #define HB_OS_WIN_32_USED
 
-/* NOTE: We need this to generate proper extern references. */
-#if defined(HB_OS_WIN_32_USED)
+/* NOTE: This seems needed to generate proper extern references for BCC. 
+         Reasons unknown so far [vszakats]. */
+#if defined( HB_OS_WIN_32_USED ) && defined( __BORLANDC__ )
    #include <windows.h>
 #endif