From 4dab84e2e6be42b60b57ff59ed28a43953fdce71 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Wed, 15 Sep 1999 22:34:00 +0000 Subject: [PATCH] Tornado II defines _WIN32 ???? --- src/dbtools/dbLoadTemplate.y | 3 ++- src/include/shareLib.h | 2 +- src/libCom/misc/shareLib.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/dbtools/dbLoadTemplate.y b/src/dbtools/dbLoadTemplate.y index 51989d442..ddd878866 100644 --- a/src/dbtools/dbLoadTemplate.y +++ b/src/dbtools/dbLoadTemplate.y @@ -39,7 +39,8 @@ #include "macLib.h" #include "dbmf.h" #include "epicsVersion.h" -#ifdef _WIN32 +/* amazing, but true, WRS Tornado II defines _WIN32 ! */ +#if !(defined(vxWorks) && defined(_WIN32) #include "getopt.h" #endif diff --git a/src/include/shareLib.h b/src/include/shareLib.h index c74ee5ede..a1272c33b 100644 --- a/src/include/shareLib.h +++ b/src/include/shareLib.h @@ -74,7 +74,7 @@ * Also check for "EPICS_DLL_NO" not defined so that we will not use these * keywords if it is an object library build of base under WIN32. */ -#if defined(_WIN32) && !defined(__CYGWIN32__) +#if defined(_WIN32) && !defined(__GNUC__) # if defined(epicsExportSharedSymbols) # if defined(EPICS_DLL_NO) /* this indicates that we are not building a DLL */ diff --git a/src/libCom/misc/shareLib.h b/src/libCom/misc/shareLib.h index c74ee5ede..a1272c33b 100644 --- a/src/libCom/misc/shareLib.h +++ b/src/libCom/misc/shareLib.h @@ -74,7 +74,7 @@ * Also check for "EPICS_DLL_NO" not defined so that we will not use these * keywords if it is an object library build of base under WIN32. */ -#if defined(_WIN32) && !defined(__CYGWIN32__) +#if defined(_WIN32) && !defined(__GNUC__) # if defined(epicsExportSharedSymbols) # if defined(EPICS_DLL_NO) /* this indicates that we are not building a DLL */