From 2f6fad0cc3c9c5b8b887021e1db8c8fb44d54fec Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 1 May 2015 11:38:54 -0500 Subject: [PATCH] Fixing and/or investigating Cygwin issues --- configure/os/CONFIG_SITE.Common.cygwin-x86_64 | 8 ++++++++ src/libCom/osi/os/cygwin32/systemCallIntMech.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure/os/CONFIG_SITE.Common.cygwin-x86_64 b/configure/os/CONFIG_SITE.Common.cygwin-x86_64 index 3950526d1..9b2ccdd3b 100644 --- a/configure/os/CONFIG_SITE.Common.cygwin-x86_64 +++ b/configure/os/CONFIG_SITE.Common.cygwin-x86_64 @@ -12,3 +12,11 @@ # Uncomment the following line if readline has problems #LDLIBS_READLINE = -lreadline -lcurses + +# It makes sense to include debugging symbols even in optimized builds +# in case you want to attach gdb to the process or examine a core-dump. +# This does cost disk space, but not memory as debug symbols are not +# loaded into RAM when the binary is loaded. +OPT_CFLAGS_YES += -g +OPT_CXXFLAGS_YES += -g + diff --git a/src/libCom/osi/os/cygwin32/systemCallIntMech.cpp b/src/libCom/osi/os/cygwin32/systemCallIntMech.cpp index 6a5ce4c9f..93da75ea6 100644 --- a/src/libCom/osi/os/cygwin32/systemCallIntMech.cpp +++ b/src/libCom/osi/os/cygwin32/systemCallIntMech.cpp @@ -19,7 +19,7 @@ enum epicsSocketSystemCallInterruptMechanismQueryInfo epicsSocketSystemCallInterruptMechanismQuery () { -#if (CYGWIN_VERSION_DLL_MAJOR >= 1007) && (CYGWIN_VERSION_DLL_MINOR < 15) +#if (CYGWIN_VERSION_DLL_MAJOR == 1007) && (CYGWIN_VERSION_DLL_MINOR < 15) // Behaviour changed in early Cygwin 1.7 releases, reverted later. return esscimqi_socketCloseRequired; #else