From f3c381e0bfb64af555c9b5d86e20129bc42706df Mon Sep 17 00:00:00 2001 From: Paul Tucker Date: Fri, 31 Mar 2000 14:54:27 +0000 Subject: [PATCH] 20000331-09:50 est --- harbour/ChangeLog | 8 ++++++++ harbour/source/rdd/dbf1.c | 19 +++++++++++++++++-- harbour/source/rdd/dbfcdx/dbfcdx1.c | 19 +++++++++++++++++-- harbour/source/rdd/dbfntx/dbfntx1.c | 19 +++++++++++++++++-- harbour/source/rdd/delim1.c | 19 +++++++++++++++++-- harbour/source/rdd/sdf1.c | 19 +++++++++++++++++-- 6 files changed, 93 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6631baba14..af60b70535 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +20000331-09:50 EST Paul Tucker + * source/rdd/dbf1.c + * source/rdd/sdf1.c + * source/rdd/delim1.c + * source/rdd/dbfcdx/dbfcdx1.c + * source/rdd/dbfntx/dbfntx1.c + * updated initSymbols handling + 20000331-06:40 EST Paul Tucker * source/rtl/diskspac.c * minor code opt. diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index 2f82eb39f2..fdc33181e2 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -103,8 +103,23 @@ HB_INIT_SYMBOLS_BEGIN( dbf1__InitSymbols ) { "_DBFC", HB_FS_PUBLIC, HB_FUNCNAME( _DBFC ), NULL }, { "DBF_GETFUNCTABLE", HB_FS_PUBLIC, HB_FUNCNAME( DBF_GETFUNCTABLE ), NULL } HB_INIT_SYMBOLS_END( dbf1__InitSymbols ) -#if ! defined(__GNUC__) && ! defined(_MSC_VER) - #pragma startup dbf1__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_dbf1__InitSymbols = &dbf1__InitSymbols; + #pragma warning( default: 4152 ) + #pragma data_seg() + +#else + + #if ! defined(__GNUC__) + #pragma startup dbf1__InitSymbols + #endif #endif #define LOCK_START 0x40000000L diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index 5cfe4fc75d..ef66e652f5 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -102,8 +102,23 @@ HB_INIT_SYMBOLS_BEGIN( dbfcdx1__InitSymbols ) { "_DBFCDX", HB_FS_PUBLIC, HB_FUNCNAME( _DBFCDX ), NULL }, { "DBFCDX_GETFUNCTABLE", HB_FS_PUBLIC, HB_FUNCNAME( DBFCDX_GETFUNCTABLE ), NULL } HB_INIT_SYMBOLS_END( dbfcdx1__InitSymbols ) -#if ! defined(__GNUC__) && ! defined(_MSC_VER) - #pragma startup dbfcdx1__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_dbfcdx1__InitSymbols = &dbfcdx1__InitSymbols; + #pragma warning( default: 4152 ) + #pragma data_seg() + +#else + + #if ! defined(__GNUC__) + #pragma startup dbfcdx1__InitSymbols + #endif #endif #define LOCK_START 0x40000000L diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c index f952346203..3328f6d3ba 100644 --- a/harbour/source/rdd/dbfntx/dbfntx1.c +++ b/harbour/source/rdd/dbfntx/dbfntx1.c @@ -48,8 +48,23 @@ HB_INIT_SYMBOLS_BEGIN( dbfntx1__InitSymbols ) { "_DBFNTX", HB_FS_PUBLIC, HB_FUNCNAME( _DBFNTX ), NULL }, { "DBFNTX_GETFUNCTABLE", HB_FS_PUBLIC, HB_FUNCNAME( DBFNTX_GETFUNCTABLE ), NULL } HB_INIT_SYMBOLS_END( dbfntx1__InitSymbols ) -#if ! defined(__GNUC__) && ! defined(_MSC_VER) - #pragma startup dbfntx1__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_dbfntx1__InitSymbols = &dbfntx1__InitSymbols; + #pragma warning( default: 4152 ) + #pragma data_seg() + +#else + + #if ! defined(__GNUC__) + #pragma startup dbfntx1__InitSymbols + #endif #endif static RDDFUNCS ntxSuper = { 0 }; diff --git a/harbour/source/rdd/delim1.c b/harbour/source/rdd/delim1.c index 9a5dde6c34..53937c1843 100644 --- a/harbour/source/rdd/delim1.c +++ b/harbour/source/rdd/delim1.c @@ -47,8 +47,23 @@ HB_INIT_SYMBOLS_BEGIN( delim1__InitSymbols ) { "_DELIMC", HB_FS_PUBLIC, HB_FUNCNAME( _DELIMC ), NULL }, { "DELIM_GETFUNCTABLE", HB_FS_PUBLIC, HB_FUNCNAME( DELIM_GETFUNCTABLE ), NULL } HB_INIT_SYMBOLS_END( delim1__InitSymbols ) -#if ! defined(__GNUC__) && ! defined(_MSC_VER) - #pragma startup delim1__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_delim1__InitSymbols = &delim1__InitSymbols; + #pragma warning( default: 4152 ) + #pragma data_seg() + +#else + + #if ! defined(__GNUC__) + #pragma startup delim1__InitSymbols + #endif #endif static RDDFUNCS delimSuper = { 0 }; diff --git a/harbour/source/rdd/sdf1.c b/harbour/source/rdd/sdf1.c index 55204b2119..ffcef75c35 100644 --- a/harbour/source/rdd/sdf1.c +++ b/harbour/source/rdd/sdf1.c @@ -47,8 +47,23 @@ HB_INIT_SYMBOLS_BEGIN( sdf1__InitSymbols ) { "_SDFC", HB_FS_PUBLIC, HB_FUNCNAME( _SDFC ), NULL }, { "SDF_GETFUNCTABLE", HB_FS_PUBLIC, HB_FUNCNAME( SDF_GETFUNCTABLE ), NULL } HB_INIT_SYMBOLS_END( sdf1__InitSymbols ) -#if ! defined(__GNUC__) && ! defined(_MSC_VER) - #pragma startup sdf1__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_sdf1__InitSymbols = &sdf1__InitSymbols; + #pragma warning( default: 4152 ) + #pragma data_seg() + +#else + + #if ! defined(__GNUC__) + #pragma startup sdf1__InitSymbols + #endif #endif static RDDFUNCS sdfSuper = { 0 };