From 2163b7e60eb1ff595e9982481640683b2ccf5a6e Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 19 Mar 1998 00:04:32 +0000 Subject: [PATCH] dont use Vis C++ key words under the Cygnus GNU environment --- src/include/shareLib.h | 12 ++++++++++-- src/libCom/misc/shareLib.h | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/include/shareLib.h b/src/include/shareLib.h index 857a3b45c..9d7a7faba 100644 --- a/src/include/shareLib.h +++ b/src/include/shareLib.h @@ -65,7 +65,13 @@ #undef epicsShareAPIV #undef READONLY -#if defined(_WIN32) +/* + * if its WIN32 and it isnt the Cygnus GNU environment + * (I am assuming Borlund and other MS Vis C++ competitors + * support these MS VisC++ defacto standard keywords???? If not + * then we should just switch on defined(_MSC_VER) here) + */ +#if defined(_WIN32) && !defined(__CYGWIN32__) # if defined(epicsExportSharedSymbols) # define epicsShareExtern extern __declspec(dllexport) @@ -90,7 +96,9 @@ # define epicsShareAPIV __cdecl # define epicsShareDef __declspec(dllexport) # define READONLY const - +/* + * if its the old VAX C Compiler (not DEC C) + */ #elif defined(VAXC) /* diff --git a/src/libCom/misc/shareLib.h b/src/libCom/misc/shareLib.h index 857a3b45c..9d7a7faba 100644 --- a/src/libCom/misc/shareLib.h +++ b/src/libCom/misc/shareLib.h @@ -65,7 +65,13 @@ #undef epicsShareAPIV #undef READONLY -#if defined(_WIN32) +/* + * if its WIN32 and it isnt the Cygnus GNU environment + * (I am assuming Borlund and other MS Vis C++ competitors + * support these MS VisC++ defacto standard keywords???? If not + * then we should just switch on defined(_MSC_VER) here) + */ +#if defined(_WIN32) && !defined(__CYGWIN32__) # if defined(epicsExportSharedSymbols) # define epicsShareExtern extern __declspec(dllexport) @@ -90,7 +96,9 @@ # define epicsShareAPIV __cdecl # define epicsShareDef __declspec(dllexport) # define READONLY const - +/* + * if its the old VAX C Compiler (not DEC C) + */ #elif defined(VAXC) /*