From 4a48b29855f100f10ea67d5287557280bd8b5fef Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 31 May 2008 08:09:09 +0000 Subject: [PATCH] 2008-05-31 09:57 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * include/hbdefs.h * For __BORLANDC__: _declspec( dllexport ) -> __declspec( dllexport ) _declspec( dllimport ) -> __declspec( dllimport ) to suppress warning: Non-ANSI keyword used: '_declspec'. NOTE1: This warning could be normally seen when compiling contrib/rddads/ads1.c after the recent addition of -w switch to enable BCC warnings. NOTE2: Neither look like ANSI C, and both are undocumented in BCC. ; Please test. * include/hberrors.h * source/compiler/hbgenerr.c + Pointless historical surprise added. * contrib/mtpl_b32.mak - Removed duplicate -d switch. * contrib/rddads/ads1.c + Empty line. * TODO - Removed TBrowse() item. --- harbour/ChangeLog | 26 ++++++++++++++++++++++++++ harbour/TODO | 5 ----- harbour/contrib/mtpl_b32.mak | 2 +- harbour/contrib/rddads/ads1.c | 2 +- harbour/include/hbdefs.h | 4 ++-- harbour/include/hberrors.h | 4 ++++ harbour/source/compiler/hbgenerr.c | 8 +++++++- 7 files changed, 41 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1987262fc1..4cf635ac9e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,32 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-05-31 09:57 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * include/hbdefs.h + * For __BORLANDC__: + _declspec( dllexport ) -> __declspec( dllexport ) + _declspec( dllimport ) -> __declspec( dllimport ) + to suppress warning: Non-ANSI keyword used: '_declspec'. + NOTE1: This warning could be normally seen when compiling + contrib/rddads/ads1.c after the recent addition + of -w switch to enable BCC warnings. + NOTE2: Neither look like ANSI C, and both are undocumented + in BCC. + ; Please test. + + * include/hberrors.h + * source/compiler/hbgenerr.c + + Pointless historical surprise added. + + * contrib/mtpl_b32.mak + - Removed duplicate -d switch. + + * contrib/rddads/ads1.c + + Empty line. + + * TODO + - Removed TBrowse() item. + 2008-05-30 22:06 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * source/pp/ppcore.c * "hb_inLine" -> "hb_inline" diff --git a/harbour/TODO b/harbour/TODO index 1786f4b162..56a71cb84a 100644 --- a/harbour/TODO +++ b/harbour/TODO @@ -23,11 +23,6 @@ Status...: Open. *** -Assign to: -Detail...: TBrowse() implementation still has bugs. -Status...: Open. - - ======================================================================= Tasks for v.1 release: ---------------------- diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index 85c8be3d50..274b190201 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -119,7 +119,7 @@ HB_BUILD_MODE = #********************************************************** -CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) $(HB_BUILD_MODE) +CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) $(HB_BUILD_MODE) #----------- !if "$(HB_BUILD_DEBUG)" == "yes" diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index 0b446839d9..61785fcecd 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -50,8 +50,8 @@ * */ - #define HB_OS_WIN_32_USED + #define HB_SET_IMPORT #define SUPERTABLE ( &adsSuper ) #define MAX_STR_LEN 255 diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index 49cefe83a3..37b9f7d277 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -1169,7 +1169,7 @@ typedef PHB_FUNC HB_FUNC_PTR; #define HB_EXPORT __attribute__ ((visibility ("default"))) #elif defined( __BORLANDC__ ) - #define HB_EXPORT _declspec( dllexport ) + #define HB_EXPORT __declspec( dllexport ) #elif defined( __WATCOMC__ ) #define HB_EXPORT __declspec( dllexport ) @@ -1200,7 +1200,7 @@ typedef PHB_FUNC HB_FUNC_PTR; #define HB_IMPORT __attribute__ (( dllimport )) #elif defined( __BORLANDC__ ) - #define HB_IMPORT _declspec( dllimport ) + #define HB_IMPORT __declspec( dllimport ) #elif defined( __WATCOMC__ ) #define HB_IMPORT __declspec( dllimport ) diff --git a/harbour/include/hberrors.h b/harbour/include/hberrors.h index 3901b59f09..69f27b17b8 100644 --- a/harbour/include/hberrors.h +++ b/harbour/include/hberrors.h @@ -127,6 +127,10 @@ HB_EXTERN_BEGIN #define HB_COMP_ERR_NOT_VPARAMS 65 #define HB_COMP_ERR_OPEN_CFG 66 #define HB_COMP_ERR_ALWAYS_AFTER_EXIT 67 +#define HB_COMP_ERR_HISTORICAL_1 68 +#define HB_COMP_ERR_HISTORICAL_2 69 +#define HB_COMP_ERR_HISTORICAL_3 70 +#define HB_COMP_ERR_HISTORICAL_4 71 #define HB_COMP_WARN_AMBIGUOUS_VAR 1 #define HB_COMP_WARN_MEMVAR_ASSUMED 2 diff --git a/harbour/source/compiler/hbgenerr.c b/harbour/source/compiler/hbgenerr.c index 13a297eb63..d215e175c4 100644 --- a/harbour/source/compiler/hbgenerr.c +++ b/harbour/source/compiler/hbgenerr.c @@ -97,7 +97,13 @@ const char * hb_comp_szErrors[] = "Code block size too big", "%s not declared with variable number of parameters", "Can't find %s file", - "Invalid ALWAYS after %s in RECOVER code" + "Invalid ALWAYS after %s in RECOVER code", + /* Some historical, funny sounding error messages from original CA-Cl*pper. + They serve no purpose whatsoever. [vszakats] */ + "END wreaks terrible vengeance on control stack", + "Control level closure leaves gaping wound in control stack", + "Ford Maverick error number", + "Something terrible has happened" }; /* Table with parse warnings */