diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6220778518..5123cf19d3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +19991119-14:51 GMT+1 Victor Szel + * source/rdd/dbf1.c + source/rdd/delim1.c + source/rdd/sdf1.c + source/rdd/dbfcdx/dbfcdx1.c + source/rdd/dbfntx/dbfntx1.c + ! Guard for #pragmas changed to avoid MSVC warning. + 19991119-10:02 GMT+1 Victor Szel * source/common/hbfsapi.c ! Fixes (tracing mainly), cleanups. diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index ec97cfca1b..3574e50ae8 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -102,8 +102,8 @@ HB_INIT_SYMBOLS_BEGIN( dbf1__InitSymbols ) { "_DBFC", FS_PUBLIC, HB__DBFC, 0 }, { "DBF_GETFUNCTABLE", FS_PUBLIC, HB_DBF_GETFUNCTABLE, 0 } HB_INIT_SYMBOLS_END( dbf1__InitSymbols ) -#if ! defined(__GNUC__) -#pragma startup dbf1__InitSymbols +#if ! defined(__GNUC__) && ! defined(_MSC_VER) + #pragma startup dbf1__InitSymbols #endif #define LOCK_START 0x40000000L diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index 50a2eb026b..b2601f313b 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -102,8 +102,8 @@ HB_INIT_SYMBOLS_BEGIN( dbfcdx1__InitSymbols ) { "_DBFCDX", FS_PUBLIC, HB__DBFCDX, 0 }, { "DBFCDX_GETFUNCTABLE", FS_PUBLIC, HB_DBFCDX_GETFUNCTABLE, 0 } HB_INIT_SYMBOLS_END( dbfcdx1__InitSymbols ) -#if ! defined(__GNUC__) -#pragma startup dbfcdx1__InitSymbols +#if ! defined(__GNUC__) && ! defined(_MSC_VER) + #pragma startup dbfcdx1__InitSymbols #endif #define LOCK_START 0x40000000L diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c index ff91aff5d7..c9448c5acf 100644 --- a/harbour/source/rdd/dbfntx/dbfntx1.c +++ b/harbour/source/rdd/dbfntx/dbfntx1.c @@ -48,8 +48,8 @@ HB_INIT_SYMBOLS_BEGIN( dbfntx1__InitSymbols ) { "_DBFNTX", FS_PUBLIC, HB__DBFNTX, 0 }, { "DBFNTX_GETFUNCTABLE", FS_PUBLIC, HB_DBFNTX_GETFUNCTABLE, 0 } HB_INIT_SYMBOLS_END( dbfntx1__InitSymbols ) -#if ! defined(__GNUC__) -#pragma startup dbfntx1__InitSymbols +#if ! defined(__GNUC__) && ! defined(_MSC_VER) + #pragma startup dbfntx1__InitSymbols #endif static RDDFUNCS ntxSuper = { 0 }; diff --git a/harbour/source/rdd/delim1.c b/harbour/source/rdd/delim1.c index 24548ae800..a3e7b29dbc 100644 --- a/harbour/source/rdd/delim1.c +++ b/harbour/source/rdd/delim1.c @@ -47,8 +47,8 @@ HB_INIT_SYMBOLS_BEGIN( delim1__InitSymbols ) { "_DELIMC", FS_PUBLIC, HB__DELIMC, 0 }, { "DELIM_GETFUNCTABLE", FS_PUBLIC, HB_DELIM_GETFUNCTABLE, 0 } HB_INIT_SYMBOLS_END( delim1__InitSymbols ) -#if ! defined(__GNUC__) -#pragma startup delim1__InitSymbols +#if ! defined(__GNUC__) && ! defined(_MSC_VER) + #pragma startup delim1__InitSymbols #endif static RDDFUNCS delimSuper = { 0 }; diff --git a/harbour/source/rdd/sdf1.c b/harbour/source/rdd/sdf1.c index a7dd966e51..7e37a4665e 100644 --- a/harbour/source/rdd/sdf1.c +++ b/harbour/source/rdd/sdf1.c @@ -47,8 +47,8 @@ HB_INIT_SYMBOLS_BEGIN( sdf1__InitSymbols ) { "_SDFC", FS_PUBLIC, HB__SDFC, 0 }, { "SDF_GETFUNCTABLE", FS_PUBLIC, HB_SDF_GETFUNCTABLE, 0 } HB_INIT_SYMBOLS_END( sdf1__InitSymbols ) -#if ! defined(__GNUC__) -#pragma startup sdf1__InitSymbols +#if ! defined(__GNUC__) && ! defined(_MSC_VER) + #pragma startup sdf1__InitSymbols #endif static RDDFUNCS sdfSuper = { 0 };