diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 698dd1957d..36f1fc9f41 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,13 @@ +2000-03-23 20:45 GMT-5 David G. Holm + + * contrib/rdd_ads/ads1.c + * contrib/rdd_ads/adsfunc.c + * contrib/rdd_ads/rddads.h + % Made changes for MingW32 + + * contrib/rdd_ads/Makefile + + Added a Makefile for the GNU Make System + 20000322-17:35 EST Paul Tucker * source/rtl/diskspac.c * min() -> HB_MIN diff --git a/harbour/contrib/rdd_ads/Makefile b/harbour/contrib/rdd_ads/Makefile new file mode 100644 index 0000000000..423f022e0e --- /dev/null +++ b/harbour/contrib/rdd_ads/Makefile @@ -0,0 +1,16 @@ +# +# $Id$ +# + +ROOT = ../../ + +C_SOURCES=\ + ads1.c \ + adsfunc.c \ + +PRG_SOURCES=\ + ads0.prg \ + +LIBNAME=rddads + +include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/rdd_ads/ads1.c b/harbour/contrib/rdd_ads/ads1.c index 04f4769ee8..831f6ff315 100644 --- a/harbour/contrib/rdd_ads/ads1.c +++ b/harbour/contrib/rdd_ads/ads1.c @@ -35,9 +35,9 @@ #define SUPERTABLE ( &adsSuper ) #define HARBOUR_MAX_RDD_FIELDNAME_LENGTH 10 +#define HB_OS_WIN_32_USED #define MAX_STR_LEN 255 -#include "windows.h" #include "hbapi.h" #include "hbinit.h" #include "hbapiitm.h" @@ -47,8 +47,8 @@ #include "hbapierr.h" #include "rddads.h" -ERRCODE adsRecCount( ADSAREAP pArea, ULONG * pRecCount ); -ERRCODE adsReadDBHeader( ADSAREAP pArea ); +static ERRCODE adsRecCount( ADSAREAP pArea, ULONG * pRecCount ); +static ERRCODE adsReadDBHeader( ADSAREAP pArea ); HB_FUNC( _ADS ); HB_FUNC( ADS_GETFUNCTABLE ); diff --git a/harbour/contrib/rdd_ads/adsfunc.c b/harbour/contrib/rdd_ads/adsfunc.c index f02fbd3ebb..6e1e970267 100644 --- a/harbour/contrib/rdd_ads/adsfunc.c +++ b/harbour/contrib/rdd_ads/adsfunc.c @@ -33,7 +33,8 @@ * */ -#include "windows.h" +#define HB_OS_WIN_32_USED + #include "hbapi.h" #include "hbinit.h" #include "hbapiitm.h" diff --git a/harbour/contrib/rdd_ads/rddads.h b/harbour/contrib/rdd_ads/rddads.h index 89131cd538..f44850e5b0 100644 --- a/harbour/contrib/rdd_ads/rddads.h +++ b/harbour/contrib/rdd_ads/rddads.h @@ -83,4 +83,4 @@ typedef struct _ADSAREA_ ADSHANDLE hOrdCurrent; } ADSAREA; -typedef ADSAREA far * ADSAREAP; +typedef ADSAREA * ADSAREAP;