diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 81a6b0d0f5..0146fbd269 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,19 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-05-28 20:05 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/contrib/Makefile + + harbour/contrib/adordd/Makefile + + added ADORDD to default windows GNU make builds + * harbour/contrib/adordd/makefile.bc + + added -w2 to harbour compoiler switches + * harbour/contrib/adordd/adordd.prg + + added HB_SYMBOL_UNUSED() for some methods + + harbour/contrib/ole2/Makefile + + added GNU make file + * harbour/include/common.ch + * changed HB_HASH_AUTOADD_* to HB_HAUTOADD_* + 2007-05-28 18:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/bsd/gcc.cf * harbour/config/darwin/gcc.cf diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index 0b907a3ea8..ab01805531 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -33,6 +33,7 @@ else DIRS +=\ ole \ odbc \ + adordd \ endif endif diff --git a/harbour/contrib/adordd/Makefile b/harbour/contrib/adordd/Makefile new file mode 100644 index 0000000000..52586193fc --- /dev/null +++ b/harbour/contrib/adordd/Makefile @@ -0,0 +1,12 @@ +# +# $Id$ +# + +ROOT = ../../ + +PRG_SOURCES= \ + adordd.prg \ + +LIBNAME=adordd + +include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/adordd/adordd.prg b/harbour/contrib/adordd/adordd.prg index bc317552ff..0fba8fc70f 100644 --- a/harbour/contrib/adordd/adordd.prg +++ b/harbour/contrib/adordd/adordd.prg @@ -467,6 +467,8 @@ static function ADO_APPEND( nWA, lUnLockAll ) local oRecordSet := USRRDD_AREADATA( nWA )[ WA_RECORDSET ] + HB_SYMBOL_UNUSED( lUnLockAll ) + oRecordSet:AddNew() TRY @@ -513,6 +515,9 @@ static function ADO_RAWLOCK( nWA, nAction, nRecNo ) local oRecordSet := USRRDD_AREADATA( nWA )[ WA_RECORDSET ] + HB_SYMBOL_UNUSED( nAction ) + HB_SYMBOL_UNUSED( nRecNo ) + return SUCCESS static function ADO_LOCK( nWA, aLockInfo ) @@ -529,6 +534,8 @@ static function ADO_UNLOCK( nWA, xRecID ) local oRecordSet := USRRDD_AREADATA( nWA )[ WA_RECORDSET ] + HB_SYMBOL_UNUSED( xRecID ) + return SUCCESS static function ADO_SETFILTER( nWA, aFilterInfo ) diff --git a/harbour/contrib/adordd/makefile.bc b/harbour/contrib/adordd/makefile.bc index 0b87ef6e1f..c9806dc74d 100644 --- a/harbour/contrib/adordd/makefile.bc +++ b/harbour/contrib/adordd/makefile.bc @@ -22,4 +22,4 @@ adordd.c : adordd.prg tlib $(LIB_DIR)\adordd.lib -+$@,, .prg.c: - $(BIN_DIR)\harbour.exe $< -q0 -w -es2 -gc0 -n -i$(INCLUDE_DIR) -o$@ + $(BIN_DIR)\harbour.exe $< -q0 -w2 -es2 -gc0 -n -i$(INCLUDE_DIR) -o$@ diff --git a/harbour/contrib/ole2/Makefile b/harbour/contrib/ole2/Makefile new file mode 100644 index 0000000000..bcc7c1f5b2 --- /dev/null +++ b/harbour/contrib/ole2/Makefile @@ -0,0 +1,15 @@ +# +# $Id$ +# + +ROOT = ../../ + +C_SOURCES=\ + w32ole.c \ + +PRG_SOURCES=\ + win32ole.prg \ + +LIBNAME=hbole + +include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/include/common.ch b/harbour/include/common.ch index 2773244983..1ccb471a69 100644 --- a/harbour/include/common.ch +++ b/harbour/include/common.ch @@ -85,10 +85,10 @@ #define HB_SYMBOL_UNUSED( symbol ) ( symbol := ( symbol ) ) /* HASH autoadd options */ -#define HB_HASH_AUTOADD_NEVER 0x00 -#define HB_HASH_AUTOADD_ACCESS 0x01 -#define HB_HASH_AUTOADD_ASSIGN 0x02 -#define HB_HASH_AUTOADD_ALWAYS ( HB_HASH_AUTOADD_ACCESS + HB_HASH_AUTOADD_ASSIGN ) -#define HB_HASH_AUTOADD_REFERENCE HB_HASH_AUTOADD_ALWAYS +#define HB_HAUTOADD_NEVER 0x00 +#define HB_HAUTOADD_ACCESS 0x01 +#define HB_HAUTOADD_ASSIGN 0x02 +#define HB_HAUTOADD_ALWAYS ( HB_HAUTOADD_ACCESS + HB_HAUTOADD_ASSIGN ) +#define HB_HAUTOADD_REFERENCE HB_HAUTOADD_ALWAYS #endif /* HB_COMMON_CH_ */