From b38095a89ba09e5ea4d065456c060b479acd694d Mon Sep 17 00:00:00 2001 From: Paul Tucker Date: Fri, 31 Mar 2000 15:46:22 +0000 Subject: [PATCH] 20000331-10:45 --- harbour/ChangeLog | 4 ++++ harbour/contrib/rdd_ads/ads1.c | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index af60b70535..1bb17d0a90 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +20000331-10:45 EST Paul Tucker + * contrib/rdd_ads/ads1.c + * updated initSymbols handling + 20000331-09:50 EST Paul Tucker * source/rdd/dbf1.c * source/rdd/sdf1.c diff --git a/harbour/contrib/rdd_ads/ads1.c b/harbour/contrib/rdd_ads/ads1.c index 6053cedc71..2f0721d5fe 100644 --- a/harbour/contrib/rdd_ads/ads1.c +++ b/harbour/contrib/rdd_ads/ads1.c @@ -62,8 +62,23 @@ HB_INIT_SYMBOLS_BEGIN( ads1__InitSymbols ) { "_ADS", HB_FS_PUBLIC, HB_FUNCNAME( _ADS ), NULL }, { "ADS_GETFUNCTABLE", HB_FS_PUBLIC, HB_FUNCNAME( ADS_GETFUNCTABLE ), NULL } HB_INIT_SYMBOLS_END( ads1__InitSymbols ) -#if ! defined(__GNUC__) && ! defined(_MSC_VER) - #pragma startup ads1__InitSymbols +#if defined(_MSC_VER) + #if _MSC_VER >= 1010 + #pragma data_seg( ".CRT$XIY" ) + #pragma comment( linker, "/Merge:.CRT=.data" ) + #else + #pragma data_seg( "XIY" ) + #endif + #pragma warning( disable: 4152 ) + static void *hb_vm_auto_ads1__InitSymbols = &ads1__InitSymbols; + #pragma warning( default: 4152 ) + #pragma data_seg() + +#else + + #if ! defined(__GNUC__) + #pragma startup ads1__InitSymbols + #endif #endif static RDDFUNCS adsSuper = { 0 };