2009-03-13 12:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* INSTALL
    + Further refined GNU Make usage instructions for Windows
      compilers. The recommended way of setting it up is now
      stricter and there is mention of recommended build and
      version number.

  * contrib/hbapollo/apollo.c
  * contrib/hbapollo/apollo1.prg
    * Formatting.

harbour/ChangeLog

@@ -8,6 +8,17 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-13 12:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * INSTALL
+    + Further refined GNU Make usage instructions for Windows
+      compilers. The recommended way of setting it up is now
+      stricter and there is mention of recommended build and
+      version number.
+
+  * contrib/hbapollo/apollo.c
+  * contrib/hbapollo/apollo1.prg
+    * Formatting.
+
 2009-03-13 03:21 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * contrib/rddsql/sddpg/pgsqldd.c
     ! MSVC C++ potentially uninit'ed var warning fixed.

harbour/INSTALL

@@ -73,14 +73,17 @@ HOW TO BUILD AND INSTALL HARBOUR
           belonging to other C compilers are interfering with your setup.
           For the list of supported compilers, please look up the
           relevant section of this file.
-      3.) Make sure to have GNU Make. We recommend the one distributed
-          by MinGW team. Use this link to get it:
+      3.) Make sure to have GNU Make. Certain older versions and builds
+          are untested and may not work. We recommend the one distributed
+          by MinGW team. The latest, tested version is 3.81 at the time of
+          this writing. Use this link to get it:
             https://sourceforge.net/project/showfiles.php?group_id=2435&package_id=23918
           If you have it, you have three choices:
-          - Put mingw32-make.exe anywhere in your PATH. (recommended)
+          - Copy mingw32-make.exe or make.exe into a separate directory
+            and add that directory to the beginning of your PATH.
+            (recommended)
+          - Put mingw32-make.exe anywhere in your PATH.
           - Put mingw32-make.exe in Harbour source root dir.
-          - Rename mingw32-make.exe to make.exe and put it in
-            your PATH _before_ your compiler tools.
 
       > set HB_COMPILER=<msvc|owatcom|bcc|pocc|...>
       > set HB_INSTALL_PREFIX=<DIR>
@@ -250,7 +253,7 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR
    HB_BIN_COMPILE=<HARBOUR_NATIVE_BUILD_DIR>\bin
    HB_PPGEN_PATH=<HARBOUR_NATIVE_BUILD_DIR>\bin
 
-   You need these when building for a platform different to host.
+   You need these when building for a platform different than host.
    For this to work, you will need to point above envvars to
    a native Harbour build available on your system. You don't need
    a full native build, harbour.exe and hbpp.exe are enough for

harbour/contrib/hbapollo/apollo.c

@@ -54,7 +54,7 @@
  * NOTE: Functions are listed alfabetically
  * --------------------------------------------------*/
 
-/* NOTE: This hack is needed to suppress 'non-ANSI 
+/* NOTE: This hack is needed to suppress 'non-ANSI
          keyword' warnings inside Sde61.h. */
 #if defined( __BORLANDC__ ) || defined( __WATCOMC__ )
    #define _declspec __declspec
@@ -288,8 +288,8 @@ HB_FUNC( SX_SYSPROP )
 {
    int i = hb_parni( 2 );
    hb_retni(
-    sx_SysProp( ( WORD ) hb_parni( 1 ),            /* One of the predefined constant values. See Apollo.ch */
-                ( void * ) &i ) );
+      sx_SysProp( ( WORD ) hb_parni( 1 ),            /* One of the predefined constant values. See Apollo.ch */
+                  ( void * ) &i ) );
 }
 /*
 HB_FUNC( SX_DISABLEAUTOOPEN )

harbour/contrib/hbapollo/apollo1.prg

@@ -50,12 +50,11 @@
  *
  */
 
-#include "error.ch"
 #include "rddsys.ch"
 
 /* ANNOUNCE APOLLO */
 
-init procedure ApolloInit
+INIT PROCEDURE ApolloInit
 
 /*
    REQUEST _Apollo
@@ -63,20 +62,7 @@ init procedure ApolloInit
    rddRegister( "Apollo", RDT_FULL )
 */
 
-return
+   RETURN
 
-
-
-/* -----------------20/01/2002 13:25-----------------
- * sx_GetVal()
- * --------------------------------------------------*/
-Function sx_GetVal( x )
-RETURN Val( sx_Getvariant( x ) )
-
-
-
-
-/*
-sx_GetVal()
-
-*/
+FUNCTION sx_GetVal( x )
+   RETURN Val( sx_Getvariant( x ) )