From f3de1da8cb44cc65adfc548974ffc82d5c8a6f6f Mon Sep 17 00:00:00 2001
From: Ron Pinkas <ron@profit-master.com>
Date: Fri, 20 Apr 2001 08:38:21 +0000
Subject: [PATCH] 2001-04-20 01:35 UTC-0800 Ron Pinkas <ron@profit-master.com> 
   * hb_slex.bc      * Synched with makefile.bc

   * source/common/hbtrace.c
     + Added missing #include <io.h>

   * include/hbapilng.h
   * source/rtl/langapi.c
     * Corrected declaration of hb_langDGetItem() (required for C++)
---
 harbour/ChangeLog               | 11 +++++++++++
 harbour/hb_slex.bc              |  9 ++++++++-
 harbour/include/hbapilng.h      |  2 +-
 harbour/source/common/hbtrace.c |  1 +
 harbour/source/rtl/langapi.c    |  8 ++++----
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0bf26aa4a0..1ece716f63 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,14 @@
+2001-04-20 01:35 UTC-0800 Ron Pinkas <ron@profit-master.com>
+   * hb_slex.bc
+     * Synched with makefile.bc
+
+   * source/common/hbtrace.c
+     + Added missing #include <io.h>
+
+   * include/hbapilng.h
+   * source/rtl/langapi.c
+     * Corrected declaration of hb_langDGetItem() (required for C++)
+
 2001-04-19 17:10 UTC-0400 David G. Holm <dholm@jsd-llc.com>
 
   * hb_slex.bc
diff --git a/harbour/hb_slex.bc b/harbour/hb_slex.bc
index ab95ebc5d6..806061b94f 100644
--- a/harbour/hb_slex.bc
+++ b/harbour/hb_slex.bc
@@ -405,6 +405,7 @@ DBFNTX_LIB_OBJS = \
    \
    $(OBJ_DIR)\dbfntx0.obj
 
+
 DBFCDX_LIB_OBJS = \
    $(OBJ_DIR)\dbfcdx1.obj \
    \
@@ -643,7 +644,6 @@ all: \
    $(HBTEST_EXE) \
    $(HBDOC_EXE) \
    $(HBMAKE_EXE)
-
 #
 # Library dependencies and build rules
 #
@@ -1173,6 +1173,13 @@ $(OBJ_DIR)\dbdelim.obj : $(OBJ_DIR)\dbdelim.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\dbsdf.c : $(RTL_DIR)\dbsdf.prg
+   $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
+
+$(OBJ_DIR)\dbsdf.obj : $(OBJ_DIR)\dbsdf.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\defpath.obj : $(RTL_DIR)\defpath.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
diff --git a/harbour/include/hbapilng.h b/harbour/include/hbapilng.h
index 7c0270893c..fbdda87f8b 100644
--- a/harbour/include/hbapilng.h
+++ b/harbour/include/hbapilng.h
@@ -80,7 +80,7 @@ extern PHB_LANG hb_langFind             ( char * pszID );
 
 extern PHB_LANG hb_langSelect           ( PHB_LANG lang );
 extern char *   hb_langSelectID         ( char * pszID );
-extern void *   hb_langDGetItem         ( int iIndex );
+extern char *   hb_langDGetItem         ( int iIndex );
 extern char *   hb_langID               ( void );
 extern char *   hb_langName             ( void );
 
diff --git a/harbour/source/common/hbtrace.c b/harbour/source/common/hbtrace.c
index 09d2105aec..6ac975cb04 100644
--- a/harbour/source/common/hbtrace.c
+++ b/harbour/source/common/hbtrace.c
@@ -54,6 +54,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <io.h>
 
 #include "hbapi.h"
 #include "hbtrace.h"
diff --git a/harbour/source/rtl/langapi.c b/harbour/source/rtl/langapi.c
index 48703ef8e2..87582d3ab3 100644
--- a/harbour/source/rtl/langapi.c
+++ b/harbour/source/rtl/langapi.c
@@ -39,7 +39,7 @@
 /* Always link in the default language */
 HB_LANG_REQUEST( HB_LANG_DEFAULT );
 
-/* NOTE: This is the maximum number of registered languages, later this can be 
+/* NOTE: This is the maximum number of registered languages, later this can be
          made dynamic. */
 #define HB_LANG_MAX_ 64
 
@@ -148,12 +148,12 @@ char * hb_langSelectID( char * pszID )
    return pszIDOld;
 }
 
-void * hb_langDGetItem( int iIndex )
+char * hb_langDGetItem( int iIndex )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_langDGetItem(%i)", iIndex));
 
    if( s_lang && iIndex >= 0 && iIndex < HB_LANG_ITEM_MAX_ )
-      return s_lang->pItemList[ iIndex ];
+      return (char *) s_lang->pItemList[ iIndex ];
    else
       return NULL;
 }
@@ -175,7 +175,7 @@ char * hb_langName( void )
    char * pszName = ( char * ) hb_xgrab( 128 );
 
    if( s_lang )
-      sprintf( pszName, "Harbour Language: %s %s (%s)", 
+      sprintf( pszName, "Harbour Language: %s %s (%s)",
          ( char * ) hb_langDGetItem( HB_LANG_ITEM_BASE_ID + HB_LANG_ITEM_ID_ID ),
          ( char * ) hb_langDGetItem( HB_LANG_ITEM_BASE_ID + HB_LANG_ITEM_ID_NAME ),
          ( char * ) hb_langDGetItem( HB_LANG_ITEM_BASE_ID + HB_LANG_ITEM_ID_NAMENAT ) );