Tornado II defines _WIN32 ????
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user