From 20271ae59a18806ddafefbf3fd41165c043db179 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Tue, 23 Dec 2008 02:08:51 +0000 Subject: [PATCH] 2008-12-23 03:11 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/ChangeLog * harbour/contrib/rddado/adordd.ch * harbour/contrib/hbwin/hbwin.h * converted TABs to SPACEs * harbour/include/hbapicdp.h * formatting * harbour/config/rules.cf * harbour/config/w32/mingwce.cf * harbour/config/w32/poccce.cf * harbour/config/w32/msvcce.cf ! fixed repeated HB_FLAGS --- harbour/ChangeLog | 19 +++++++++++++-- harbour/config/rules.cf | 5 +++- harbour/config/w32/mingwce.cf | 2 +- harbour/config/w32/msvcce.cf | 2 +- harbour/config/w32/poccce.cf | 2 +- harbour/contrib/hbwin/hbwin.h | 40 ++++++++++++++++---------------- harbour/contrib/rddado/adordd.ch | 18 +++++++------- harbour/include/hbapicdp.h | 2 +- 8 files changed, 54 insertions(+), 36 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index db20c648e8..1e4a44823e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,21 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-12-23 03:11 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/ChangeLog + * harbour/contrib/rddado/adordd.ch + * harbour/contrib/hbwin/hbwin.h + * converted TABs to SPACEs + + * harbour/include/hbapicdp.h + * formatting + + * harbour/config/rules.cf + * harbour/config/w32/mingwce.cf + * harbour/config/w32/poccce.cf + * harbour/config/w32/msvcce.cf + ! fixed repeated HB_FLAGS + 2008-12-22 16:30 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/ChangeLog ! cleaned some typos in my recent ChangeLog entries @@ -1020,8 +1035,8 @@ IF nMessage == WM_LBUTTONDOWN Win_MessageBox( , 'Prg level callback procedure!, 'Info' ) RETURN 0 - ENDIF - + ENDIF + RETURN 1 Before this mechanism was available with only C callbacks which diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf index 9364871f2b..4a8ae53e91 100644 --- a/harbour/config/rules.cf +++ b/harbour/config/rules.cf @@ -20,7 +20,10 @@ HB := $(HB_BIN_COMPILE)/ endif HB := $(HB)harbour$(EXE_EXT) -HB_FLAGS := -n -i$(HB_INC_COMPILE) -q0 -w3 -es2 -gc3 -km -l $(HB_FLAGS) +ifeq ($(HB_GCMODE),) + HB_GCMODE=3 +endif +HB_FLAGS := -n -i$(HB_INC_COMPILE) -q0 -w3 -es2 -gc$(HB_GCMODE) -km -l # The rule to link an executable. ifeq ($(LD_RULE),) diff --git a/harbour/config/w32/mingwce.cf b/harbour/config/w32/mingwce.cf index 3fa4b159c8..5ccc474349 100644 --- a/harbour/config/w32/mingwce.cf +++ b/harbour/config/w32/mingwce.cf @@ -10,7 +10,7 @@ LIB_PREF = lib LIB_EXT = .a # Favor size for CE builds. -HB_FLAGS = -gc0 +HB_GCMODE=0 CC = $(CCPREFIX)gcc CC_IN = -c diff --git a/harbour/config/w32/msvcce.cf b/harbour/config/w32/msvcce.cf index aad3e4d095..4c0a5d7c51 100644 --- a/harbour/config/w32/msvcce.cf +++ b/harbour/config/w32/msvcce.cf @@ -12,7 +12,7 @@ LIB_PREF = LIB_EXT = .lib # Favor size for CE builds. -HB_FLAGS = -gc0 +HB_GCMODE=0 CC = cl.exe CC_IN = -c diff --git a/harbour/config/w32/poccce.cf b/harbour/config/w32/poccce.cf index 825df9e5cd..8f87d3275e 100644 --- a/harbour/config/w32/poccce.cf +++ b/harbour/config/w32/poccce.cf @@ -13,7 +13,7 @@ LIB_PREF = LIB_EXT = .lib # Favor size for CE builds. -HB_FLAGS = -gc0 +HB_GCMODE=0 CC = pocc.exe CC_IN = -c diff --git a/harbour/contrib/hbwin/hbwin.h b/harbour/contrib/hbwin/hbwin.h index 21c84751a7..fc999b9dce 100644 --- a/harbour/contrib/hbwin/hbwin.h +++ b/harbour/contrib/hbwin/hbwin.h @@ -50,26 +50,26 @@ * */ -#define FCNCREATEFILE 1 -#define FCNGETCOMMSTATE 2 -#define FCNSETCOMMSTATE 3 -#define FCNSETUPCOMM 4 -#define FCNGETCOMMTIMEOUTS 5 -#define FCNSETCOMMTIMEOUTS 6 -#define FCNCLOSEHANDLE 7 -#define FCNWRITEFILE 8 -#define FCNREADFILE 9 -#define FCNGETCOMMMODEMSTATUS 10 /* WinPort:Status() */ -#define FCNPURGECOMM 11 -#define FCNCLEARCOMMERROR 12 /* WinPort:QueueStatus() */ +#define FCNCREATEFILE 1 +#define FCNGETCOMMSTATE 2 +#define FCNSETCOMMSTATE 3 +#define FCNSETUPCOMM 4 +#define FCNGETCOMMTIMEOUTS 5 +#define FCNSETCOMMTIMEOUTS 6 +#define FCNCLOSEHANDLE 7 +#define FCNWRITEFILE 8 +#define FCNREADFILE 9 +#define FCNGETCOMMMODEMSTATUS 10 /* WinPort:Status() */ +#define FCNPURGECOMM 11 +#define FCNCLEARCOMMERROR 12 /* WinPort:QueueStatus() */ #define ESCAPECOMMFUNCTION 13 #define FCNGETCOMMPROPERTIES 14 -#define FCNMAX 14 +#define FCNMAX 14 -#define WPDBGBASIC 0x01 -#define WPDBGFLOW 0x02 -#define WPDBGXTRAFLOW 0x04 -#define WPDBGOTHER 0x08 -#define WPDBGTIMEOUTS 0x10 -#define WPDBGQUEUE 0x20 -#define WPDBGALL 0x3F +#define WPDBGBASIC 0x01 +#define WPDBGFLOW 0x02 +#define WPDBGXTRAFLOW 0x04 +#define WPDBGOTHER 0x08 +#define WPDBGTIMEOUTS 0x10 +#define WPDBGQUEUE 0x20 +#define WPDBGALL 0x3F diff --git a/harbour/contrib/rddado/adordd.ch b/harbour/contrib/rddado/adordd.ch index 3de6526cc6..adc06a2dfd 100644 --- a/harbour/contrib/rddado/adordd.ch +++ b/harbour/contrib/rddado/adordd.ch @@ -73,9 +73,9 @@ #define adInteger 3 #define adBigInt 20 #define adUnsignedTinyInt 17 -#define adUnsignedSmallInt 18 -#define adUnsignedInt 19 -#define adUnsignedBigInt 21 +#define adUnsignedSmallInt 18 +#define adUnsignedInt 19 +#define adUnsignedBigInt 21 #define adSingle 4 #define adDouble 5 #define adCurrency 6 @@ -95,18 +95,18 @@ #define adBSTR 8 #define adChar 129 #define adVarChar 200 -#define adLongVarChar 201 +#define adLongVarChar 201 #define adWChar 130 #define adVarWChar 202 -#define adLongVarWChar 203 +#define adLongVarWChar 203 #define adBinary 128 -#define adVarBinary 204 -#define adLongVarBinary 205 +#define adVarBinary 204 +#define adLongVarBinary 205 #define adChapter 136 #define adFileTime 64 -#define adPropVariant 138 +#define adPropVariant 138 #define adVarNumeric 139 -#define adArray // &H2000 +#define adArray // &H2000 #define adRecDeleted 4 diff --git a/harbour/include/hbapicdp.h b/harbour/include/hbapicdp.h index f0cd351984..572c240dd0 100644 --- a/harbour/include/hbapicdp.h +++ b/harbour/include/hbapicdp.h @@ -269,7 +269,7 @@ extern HB_EXPORT int hb_cdpcmp( const char *, ULONG, const char *, ULO extern HB_EXPORT int hb_cdpicmp( const char *, ULONG, const char *, ULONG, PHB_CODEPAGE, BOOL ); extern HB_EXPORT int hb_cdpchrcmp( char, char, PHB_CODEPAGE ); extern HB_EXPORT void hb_cdpReleaseAll( void ); - + extern HB_EXPORT USHORT hb_cdpGetU16( PHB_CODEPAGE, BOOL, BYTE ); extern HB_EXPORT UCHAR hb_cdpGetChar( PHB_CODEPAGE, BOOL, USHORT ); extern HB_EXPORT BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE, BOOL, BYTE, int *, USHORT * );