Merge branch 'master' into master

This commit is contained in:
Martin Hořeňovský authored and GitHub committed 2018-03-07 10:37:50 +01:00
commit 552589f25b
35 files changed
+255 -150

No files matched your search

@@ -68,11 +68,7 @@
////////////////////////////////////////////////////////////////////////////////
// We know some environments not to support full POSIX signals
#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__)
# if !defined(CATCH_CONFIG_POSIX_SIGNALS)
# define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
# endif
#define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
#endif
#ifdef __OS400__