From fee62836cd2e728eca7dc43e980857603c0d8c34 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Fri, 26 Feb 2016 16:27:13 -0600
Subject: [PATCH] Use OS __CYGWIN__ macro, deprecate our CYGWIN32

---
 configure/os/CONFIG.Common.cygwin-x86 | 6 +++---
 src/libCom/misc/shareLib.h            | 2 +-
 src/libCom/osi/os/posix/osdTime.cpp   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure/os/CONFIG.Common.cygwin-x86 b/configure/os/CONFIG.Common.cygwin-x86
index 39c528f14..a0f542f3f 100644
--- a/configure/os/CONFIG.Common.cygwin-x86
+++ b/configure/os/CONFIG.Common.cygwin-x86
@@ -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
diff --git a/src/libCom/misc/shareLib.h b/src/libCom/misc/shareLib.h
index c5204092e..f36802361 100644
--- a/src/libCom/misc/shareLib.h
+++ b/src/libCom/misc/shareLib.h
@@ -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 */
diff --git a/src/libCom/osi/os/posix/osdTime.cpp b/src/libCom/osi/os/posix/osdTime.cpp
index 987629f51..8a075f8ae 100644
--- a/src/libCom/osi/os/posix/osdTime.cpp
+++ b/src/libCom/osi/os/posix/osdTime.cpp
@@ -44,7 +44,7 @@
     } // extern "C"
 #endif
 
-#ifdef CYGWIN32
+#ifdef __CYGWIN__
 int clock_settime(clockid_t clock, const timespec *tp)
 {
     return -EFAULT;