2009-11-28 20:02 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbmisc/spd.c
    * __XHARBOUR__ protected DATETIME part converted to commented code.
    ; TODO: Xavi, pls update this code to build with Harbour, now
            we have DATETIME support as well.

  * utils/hbformat/hbformat.prg
  * src/rdd/usrrdd/rdds/logrdd.prg
  * tests/usrrdd/exlog.prg
  * contrib/gtwvg/wvgutils.c
  * examples/httpsrv/cgifunc.prg
  * examples/httpsrv/session.prg
    - Deleted __XHARBOUR__ protected parts.

  * examples/rddado/adordd.prg
  * examples/httpsrv/uhttpd.prg
    * TRY/CATCH converted to BEGIN SEQUENCE, dropping all __XHARBOUR__
      portected parts.

  * include/hbapi.h
    * TRUE/FALSE -> HB_TRUE/HB_FALSE.

harbour/examples/httpsrv/cgifunc.prg

@@ -50,10 +50,6 @@
  *
  */
 
-#ifdef __XHARBOUR__
-   #include "hbcompat.ch"
-#else
-//#include "xhb.ch"
 #include "common.ch"
 #include "error.ch"
 #include "fileio.ch"
@@ -353,7 +349,6 @@ FUNCTION uhttpd_URLEncode( cString, lComplete )
       ENDCASE
    NEXT
    RETURN cRet
-#endif
 
 /************************************************************
 * Decoding URL
@@ -862,4 +857,3 @@ FUNCTION uhttpd_HGetValue( hHash, cKey )
    ENDIF
    //RETURN IIF( cKey IN hHash:Keys, hHash[ cKey ], NIL )
    RETURN xVal
-

harbour/examples/httpsrv/session.prg

@@ -50,10 +50,6 @@
  *
  */
 
-#ifdef __XHARBOUR__
-   #include "hbcompat.ch"
-#else
-
 #include "common.ch"
 #include "hbclass.ch"
 #include "fileio.ch"

harbour/examples/httpsrv/uhttpd.prg

@@ -84,16 +84,6 @@
 
 #define FIXED_THREADS         // This force application to use fixed number of running threads and no service threads
 
-
-#ifdef __XHARBOUR__
-   #include "hbcompat.ch"
-   #xtranslate hb_StrFormat( [<x,...>] ) => hb_sprintf( <x> )
-#else
-   /* TRY / CATCH / FINALLY / END */
-   #xcommand TRY  => BEGIN SEQUENCE WITH {|oErr| Break( oErr )}
-   #xcommand CATCH [<!oErr!>] => RECOVER [USING <oErr>] <-oErr->
-   #xcommand FINALLY => ALWAYS
-#endif
 #include "fileio.ch"
 #include "common.ch"
 #include "inkey.ch"
@@ -160,26 +150,17 @@
 #define CR_LF    (CHR(13)+CHR(10))
 #define HB_IHASH()   HB_HSETCASEMATCH( {=>}, FALSE )
 
-#ifndef __XHARBOUR__
-
-  #ifdef __PLATFORM__WINDOWS
-     REQUEST HB_GT_WVT_DEFAULT
-     REQUEST HB_GT_WIN
-     REQUEST HB_GT_NUL
-  #else
-     REQUEST HB_GT_TRM_DEFAULT
-     REQUEST HB_GT_NUL
-  #endif
- #define THREAD_GT hb_gtVersion()
-
+#ifdef __PLATFORM__WINDOWS
+   REQUEST HB_GT_WVT_DEFAULT
+   REQUEST HB_GT_WIN
+   REQUEST HB_GT_NUL
 #else
-
-  REQUEST HB_GT_WVT
-  REQUEST HB_GT_WIN
-  REQUEST HB_GT_NUL
-
+   REQUEST HB_GT_TRM_DEFAULT
+   REQUEST HB_GT_NUL
 #endif
 
+#define THREAD_GT hb_gtVersion()
+
 // dynamic call for HRB support
 DYNAMIC HRBMAIN
 
@@ -2808,7 +2789,7 @@ STATIC FUNCTION Handler_HrbScript( cFileName )
    LOCAL cHRBBody, pHRB, oError
    LOCAL cCurPath
 
-   TRY
+   BEGIN SEQUENCE WITH {| oErr | Break( oErr ) }
       // Lock HRB to avoid MT race conditions
       IF !HRB_ACTIVATE_CACHE
          cHRBBody := HRB_LoadFromFile( uhttpd_OSFileName( cFileName ) )
@@ -2858,7 +2839,7 @@ STATIC FUNCTION Handler_HrbScript( cFileName )
          // Application in HRB module is responsible to send HTML content
       ENDIF
 
-   CATCH oError
+   RECOVER USING oError
 
       WriteToConsole( "Error!" )
 
@@ -2874,7 +2855,8 @@ STATIC FUNCTION Handler_HrbScript( cFileName )
       uhttpd_Write( "<br>Args: "        + hb_cStr( hb_ValToExp( oError:args ) ) )
       uhttpd_Write( "<br>ProcName: "    + hb_cStr( procname( 0 ) ) )
       uhttpd_Write( "<br>ProcLine: "    + hb_cStr( procline( 0 ) ) )
-   END
+
+   END SEQUENCE
 
    RETURN MakeResponse()