aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2010-05-27 14:32:51 +0300
committerLasse Collin <lasse.collin@tukaani.org>2010-05-27 14:32:51 +0300
commit44d70cb154225e47eebf15a3cfbdf3794cbb4593 (patch)
treedac4e4ed9a0bcb582f2c6b09c8ee86759761a94e
parentRemove references to the Subblock filter in xz and tests. (diff)
downloadxz-44d70cb154225e47eebf15a3cfbdf3794cbb4593.tar.xz
Take Cygwin into account in some #if lines.
This change is no-op, but good to have just in case for the future.
-rw-r--r--src/xz/signals.c2
-rw-r--r--src/xz/signals.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/xz/signals.c b/src/xz/signals.c
index b27cd5b5..807b0225 100644
--- a/src/xz/signals.c
+++ b/src/xz/signals.c
@@ -16,7 +16,7 @@
volatile sig_atomic_t user_abort = false;
-#ifndef _WIN32
+#if !(defined(_WIN32) && !defined(__CYGWIN__))
/// If we were interrupted by a signal, we store the signal number so that
/// we can raise that signal to kill the program when all cleanups have
diff --git a/src/xz/signals.h b/src/xz/signals.h
index 7603d803..5b125e0f 100644
--- a/src/xz/signals.h
+++ b/src/xz/signals.h
@@ -21,7 +21,7 @@ extern volatile sig_atomic_t user_abort;
extern void signals_init(void);
-#if defined(_WIN32) || defined(__VMS)
+#if (defined(_WIN32) && !defined(__CYGWIN__)) || defined(__VMS)
# define signals_block() do { } while (0)
# define signals_unblock() do { } while (0)
#else
@@ -34,7 +34,7 @@ extern void signals_block(void);
extern void signals_unblock(void);
#endif
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__CYGWIN__)
# define signals_exit() do { } while (0)
#else
/// If user has sent us a signal earlier to terminate the process,