epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Use OS __CYGWIN__ macro, deprecate our CYGWIN32

Browse Source
This commit is contained in:
Andrew Johnson
2016-02-26 16:27:13 -06:00
parent d943f6966f
commit fee62836cd
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure/os/CONFIG.Common.cygwin-x86
View File

@@ -23,14 +23,14 @@ POSIX_LDLIBS += -lpthread
ARCH_DEP_CFLAGS += -m32
ARCH_DEP_LDFLAGS += -m32
# Compiler defines _X86_ 1
# Compiler defines __MSVCRT__ 1
# 32-bit compiler defines _X86_ 1
# Compiler defines __CYGWIN__ 1
# Compiler defines __CYGWIN32__ 1
# 32-bit compiler defines __CYGWIN32__ 1
# Compiler defines __unix__ 1
# Compiler defines __unix 1
# Compiler defines unix 1
# This macro now deprecated, use __CYGWIN__ in the future
OP_SYS_CPPFLAGS += -DCYGWIN32
EXE=.exe

2
src/libCom/misc/shareLib.h
View File

@@ -113,7 +113,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(__CYGWIN__)
# if defined(epicsExportSharedSymbols)
# if defined(EPICS_DLL_NO) /* this indicates that we are not building a DLL */

2
src/libCom/osi/os/posix/osdTime.cpp
View File

@@ -44,7 +44,7 @@
} // extern "C"
#endif
#ifdef CYGWIN32
#ifdef __CYGWIN__
int clock_settime(clockid_t clock, const timespec *tp)
{
return -EFAULT;