From 01469701a62387edb95a93492ed3a49c9225830d Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Tue, 28 Mar 2000 00:18:28 +0000 Subject: [PATCH] See ChangeLog entry 2000-03-27 19:15 GMT-5 David G. Holm --- harbour/ChangeLog | 29 +++++++++++++++++++++++++++++ harbour/include/hbapi.h | 4 ++-- harbour/include/hbapierr.h | 4 ++-- harbour/include/hbapifs.h | 4 ++-- harbour/include/hbapigt.h | 4 ++-- harbour/include/hbapiitm.h | 4 ++-- harbour/include/hbapilng.h | 4 ++-- harbour/include/hbapirdd.h | 4 ++-- harbour/include/hbcomp.h | 4 ++-- harbour/include/hbdate.h | 4 ++-- harbour/include/hberrors.h | 4 ++-- harbour/include/hbexprop.h | 4 ++-- harbour/include/hbinit.h | 4 ++-- harbour/include/hbmacro.h | 4 ++-- harbour/include/hbpp.h | 4 ++-- harbour/include/hbset.h | 4 ++-- harbour/include/hbtrace.h | 4 ++-- harbour/include/hbvm.h | 4 ++-- harbour/include/hbvmpub.h | 4 ++-- harbour/source/macro/macro.c | 2 +- 20 files changed, 66 insertions(+), 37 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1d3fdfaeae..f7a6ddc4f4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,32 @@ +2000-03-27 19:15 GMT-5 David G. Holm + + * include\hbset.h + * include\hbapiitm.h + * include\hbapi.h + * include\hbmacro.h + * include\hbapirdd.h + * include\hbexprop.h + * include\hbdate.h + * include\hbapilng.h + * include\hbapigt.h + * include\hbcomp.h + * include\hbapifs.h + * include\hbtrace.h + * include\hberrors.h + * include\hbvmpub.h + * include\hbinit.h + * include\hbvm.h + * include\hbapierr.h + * include\hbpp.h + - Commented out all 'extern "C" {' and '}', because the ill-advised + addition of extern "C" statements is only half done (present in .h + files, but not in .c files), which prevents the os2/icc version of + Harbour from being built. + + * source/macro/macro.c + - Removed 'static' from definition of variable that is declared as + 'extern' in hbmacro.h. + 20000327-21:35 GMT+1 Victor Szakats ! Trash in harbour CVS root directory removed by SourceForge staff. diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index fcd47b5ba2..62b563c725 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -45,7 +45,7 @@ #include "hbvmpub.h" #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif /* items types and type checking macros */ @@ -485,7 +485,7 @@ extern char * hb_version( USHORT uiMode ); extern char * hb_valtypeGet( HB_ITEM_PTR ); #if defined(__cplusplus) -} +//} #endif #endif /* HB_APIEXT_H_ */ diff --git a/harbour/include/hbapierr.h b/harbour/include/hbapierr.h index 19c428116f..951151f31d 100644 --- a/harbour/include/hbapierr.h +++ b/harbour/include/hbapierr.h @@ -40,7 +40,7 @@ #include "error.ch" #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif /* Error codes (returned from hb_errLaunch()) */ @@ -156,7 +156,7 @@ typedef struct HB_ERROR_INFO_ extern HB_ERROR_INFO_PTR hb_errorHandler( HB_ERROR_INFO_PTR ); #if defined(__cplusplus) -} +//} #endif #endif /* HB_APIERR_H_ */ diff --git a/harbour/include/hbapifs.h b/harbour/include/hbapifs.h index 71f0393719..db1648fa22 100644 --- a/harbour/include/hbapifs.h +++ b/harbour/include/hbapifs.h @@ -58,7 +58,7 @@ #include "fileio.ch" #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif #define FS_ERROR F_ERROR @@ -132,7 +132,7 @@ extern PHB_FNAME hb_fsFNameSplit( char * pszFileName ); /* Split given filename extern char * hb_fsFNameMerge( char * pszFileName, PHB_FNAME pFileName ); /* This function joins path, name and extension into a string with a filename */ #if defined(__cplusplus) -} +//} #endif #endif /* HB_APIFS_H_ */ diff --git a/harbour/include/hbapigt.h b/harbour/include/hbapigt.h index b9113dd3fa..7126727111 100644 --- a/harbour/include/hbapigt.h +++ b/harbour/include/hbapigt.h @@ -55,7 +55,7 @@ #include "color.ch" #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif /* NOTE: The declaration of hb_gtSetPos(), hb_gtGetPos(), hb_gtWrite(), @@ -218,7 +218,7 @@ extern void hb_mouse_SetBounds( int iTop, int iLeft, int iBottom, int iRight ) extern void hb_mouse_GetBounds( int * piTop, int * piLeft, int * piBottom, int * piRight ); #if defined(__cplusplus) -} +//} #endif #endif /* HB_APIGT_H_ */ diff --git a/harbour/include/hbapiitm.h b/harbour/include/hbapiitm.h index e71cdf2747..5f3e4874fc 100644 --- a/harbour/include/hbapiitm.h +++ b/harbour/include/hbapiitm.h @@ -39,7 +39,7 @@ #include "hbapi.h" #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif #define HB_EVAL_PARAM_MAX_ 9 @@ -109,7 +109,7 @@ extern char * hb_itemString ( PHB_ITEM pItem, ULONG * ulLen, BOOL * bFreeReq extern PHB_ITEM hb_itemValToStr ( PHB_ITEM pItem ); /* Convert any scalar to a string */ #if defined(__cplusplus) -} +//} #endif #endif /* HB_APIITM_H_ */ diff --git a/harbour/include/hbapilng.h b/harbour/include/hbapilng.h index e29feef52e..0cf33cbb93 100644 --- a/harbour/include/hbapilng.h +++ b/harbour/include/hbapilng.h @@ -37,7 +37,7 @@ #define HB_APILNG_H_ #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif #define HB_LANG_TEXT_DATEFMT 0 @@ -108,7 +108,7 @@ extern PHB_LANG hb_langNew ( void ); extern void hb_langDelete ( PHB_LANG lang ); #if defined(__cplusplus) -} +//} #endif #endif /* HB_APILNG_H_ */ diff --git a/harbour/include/hbapirdd.h b/harbour/include/hbapirdd.h index 654d58a224..df9afd5c9f 100644 --- a/harbour/include/hbapirdd.h +++ b/harbour/include/hbapirdd.h @@ -40,7 +40,7 @@ #include "hbapifs.h" #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif /* RDD virtual machine integration functions */ @@ -1103,7 +1103,7 @@ extern USHORT hb_rddExtendType( USHORT fieldType ); extern USHORT hb_rddFieldType( USHORT extendType ); #if defined(__cplusplus) -} +//} #endif #endif /* HB_APIRDD_H_ */ diff --git a/harbour/include/hbcomp.h b/harbour/include/hbcomp.h index 29ff39e971..ada203af52 100644 --- a/harbour/include/hbcomp.h +++ b/harbour/include/hbcomp.h @@ -50,7 +50,7 @@ #include "hbpcode.h" #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif /* compiler related declarations */ @@ -372,7 +372,7 @@ extern char * hb_comp_szWarnings[]; #define HB_EXITLEVEL_DELTARGET 2 #if defined(__cplusplus) -} +//} #endif #endif /* HB_COMP_H_ */ diff --git a/harbour/include/hbdate.h b/harbour/include/hbdate.h index 5cba9ec76c..9689f8f552 100644 --- a/harbour/include/hbdate.h +++ b/harbour/include/hbdate.h @@ -37,7 +37,7 @@ #define HB_DATE_H_ #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif /* In msgxxx.c modules */ @@ -57,7 +57,7 @@ extern char * hb_dateDecStr( char * szDate, long lJulian ); extern long hb_dateEncStr( char * szDate ); #if defined(__cplusplus) -} +//} #endif #endif /* HB_DATE_H_ */ diff --git a/harbour/include/hberrors.h b/harbour/include/hberrors.h index 686980b6d0..bdebb5e7d8 100644 --- a/harbour/include/hberrors.h +++ b/harbour/include/hberrors.h @@ -37,7 +37,7 @@ #define HB_ERRORS_H_ #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif /* @@ -131,7 +131,7 @@ extern void hb_compGenError( char * _szErrors[], char cPrefix, int iError, char extern void hb_compGenWarning( char * _szWarnings[], char cPrefix, int iWarning, char * szWarning1, char * szWarning2); /* generic parsing warning management function */ #if defined(__cplusplus) -} +//} #endif #endif /* HB_ERRORS_H_ */ diff --git a/harbour/include/hbexprop.h b/harbour/include/hbexprop.h index 86ebcf5d0b..6b67a9cdc6 100644 --- a/harbour/include/hbexprop.h +++ b/harbour/include/hbexprop.h @@ -39,7 +39,7 @@ #include "hbapi.h" #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif /* value types seen at language level @@ -352,7 +352,7 @@ void hb_compExprDelete( HB_EXPR_PTR ); #endif #if defined(__cplusplus) -} +//} #endif #endif /* HB_EXPROP_H_ */ diff --git a/harbour/include/hbinit.h b/harbour/include/hbinit.h index 808c08343b..c3b54eb8cd 100644 --- a/harbour/include/hbinit.h +++ b/harbour/include/hbinit.h @@ -37,7 +37,7 @@ #define HB_INIT_H_ #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif extern void hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbols ); /* statics symbols initialization */ @@ -133,7 +133,7 @@ extern void hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbols ); /* stati #endif /* HARBOUR_STRICT_ANSI_C */ #if defined(__cplusplus) -} +//} #endif #endif /* HB_INIT_H_ */ diff --git a/harbour/include/hbmacro.h b/harbour/include/hbmacro.h index a52eaf5a16..87b2ce11eb 100644 --- a/harbour/include/hbmacro.h +++ b/harbour/include/hbmacro.h @@ -56,7 +56,7 @@ #include "hbpcode.h" #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif /* flags for compilation process @@ -136,7 +136,7 @@ extern void hb_compCodeBlockStart( HB_MACRO_DECL ); extern void hb_compCodeBlockEnd( HB_MACRO_DECL ); #if defined(__cplusplus) -} +//} #endif #endif /* HB_MACRO_H_ */ diff --git a/harbour/include/hbpp.h b/harbour/include/hbpp.h index 898c01762c..074ca5a255 100644 --- a/harbour/include/hbpp.h +++ b/harbour/include/hbpp.h @@ -42,7 +42,7 @@ #include "hbver.h" #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif /* the list of pathnames to search with #include */ @@ -108,7 +108,7 @@ extern COMMANDS * hb_pp_topCommand; extern COMMANDS * hb_pp_topTranslate; #if defined(__cplusplus) -} +//} #endif #endif /* HB_PP_H_ */ diff --git a/harbour/include/hbset.h b/harbour/include/hbset.h index 276c3a1fc2..0eabe6778f 100644 --- a/harbour/include/hbset.h +++ b/harbour/include/hbset.h @@ -87,7 +87,7 @@ #include "hbapigt.h" #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif typedef enum @@ -212,7 +212,7 @@ extern void hb_setInitialize( void ); extern void hb_setRelease( void ); #if defined(__cplusplus) -} +//} #endif #endif /* HB_SET_H_ */ diff --git a/harbour/include/hbtrace.h b/harbour/include/hbtrace.h index 7a6b90bdc8..235e75cc06 100644 --- a/harbour/include/hbtrace.h +++ b/harbour/include/hbtrace.h @@ -37,7 +37,7 @@ #define HB_TRACE_H_ #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif /* @@ -186,7 +186,7 @@ extern int hb_tr_level( void ); extern void hb_tr_trace( char * fmt, ... ); #if defined(__cplusplus) -} +//} #endif #endif /* HB_TRACE_H_ */ diff --git a/harbour/include/hbvm.h b/harbour/include/hbvm.h index c987f5c61c..9c8e258ea0 100644 --- a/harbour/include/hbvm.h +++ b/harbour/include/hbvm.h @@ -39,7 +39,7 @@ #include "hbapi.h" #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif /* Harbour virtual machine init/exit functions */ @@ -90,7 +90,7 @@ extern void hb_stackDispCall( void ); extern void hb_stackPop( void ); /* pops an item from the stack */ #if defined(__cplusplus) -} +//} #endif #endif /* HB_VM_H_ */ diff --git a/harbour/include/hbvmpub.h b/harbour/include/hbvmpub.h index 26bd174bcb..3dd8f7fcb8 100644 --- a/harbour/include/hbvmpub.h +++ b/harbour/include/hbvmpub.h @@ -39,7 +39,7 @@ #include "hbdefs.h" #if defined(__cplusplus) -extern "C" { +//extern "C" { #endif struct _HB_DYNS; @@ -77,7 +77,7 @@ typedef HB_DYNS_FUNC( PHB_DYNS_FUNC ); extern void hb_vmExecute( BYTE * pCode, PHB_SYMB pSymbols ); /* invokes the virtual machine */ #if defined(__cplusplus) -} +//} #endif #endif /* HB_VMPUB_H_ */ diff --git a/harbour/source/macro/macro.c b/harbour/source/macro/macro.c index 52d5662d6d..0bc0bda52c 100644 --- a/harbour/source/macro/macro.c +++ b/harbour/source/macro/macro.c @@ -43,7 +43,7 @@ /* TODO: * include this variable in SET subsystem ? */ -static BOOL hb_comp_bShortCuts = TRUE; /* .and. & .or. expressions shortcuts */ +BOOL hb_comp_bShortCuts = TRUE; /* .and. & .or. expressions shortcuts */ static void hb_macroUseAliased( HB_ITEM_PTR, HB_ITEM_PTR, int );