From bf659b33f173193a4306db98787a65ce621ca5d6 Mon Sep 17 00:00:00 2001 From: Paul Tucker Date: Sat, 15 Apr 2000 20:04:53 +0000 Subject: [PATCH] 20000415-16:03 DST --- harbour/ChangeLog | 4 ++++ harbour/source/rdd/dbfcdx/dbfcdx1.c | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6780396059..fe807731f0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +20000415-16:04 DST Paul Tucker + * source/rdd/dbfcdx/dbfcdx1.c + * corrected my change to the segment naming. + 20000415-21:39 GMT+1 Victor Szakats * makefile.bc diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index 1b6aa0fd32..b476f34cc2 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -258,13 +258,14 @@ HB_INIT_SYMBOLS_BEGIN( dbfcdx1__InitSymbols ) { "DBFCDX_GETFUNCTABLE", HB_FS_PUBLIC, HB_FUNCNAME( DBFCDX_GETFUNCTABLE ), NULL } HB_INIT_SYMBOLS_END( dbfcdx1__InitSymbols ) #if defined(_MSC_VER) - #pragma data_seg( INIT$BEG,"DATA" ) - #pragma data_seg( INIT$HRB,"DATA" ) + #if _MSC_VER >= 1010 + #pragma data_seg( ".CRT$XIY" ) + #pragma comment( linker, "/Merge:.CRT=.data" ) + #else + #pragma data_seg( "XIY" ) + #endif static HB_$INITSYM hb_vm_auto_dbfcdx1__InitSymbols = dbfcdx1__InitSymbols; #pragma data_seg() - #if _MSC_VER >= 1000 - #pragma comment( linker, "/Merge:.CRT=.data" ) - #endif #elif ! defined(__GNUC__) #pragma startup dbfcdx1__InitSymbols #endif