nixpkgs/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch

16 lines
776 B
Diff
Raw Normal View History

--- boost_1_40_0/boost/regex/v4/fileiter.hpp 2007-11-25 12:07:19.000000000 -0600
+++ boost_1_40_0/boost/regex/v4/fileiter.hpp 2009-08-27 23:41:34.106546200 -0500
@@ -28,11 +28,7 @@
#ifndef BOOST_REGEX_NO_FILEITER
-#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_REGEX_NO_W32)
-#error "Sorry, can't mix <windows.h> with STL code and gcc compiler: if you ran configure, try again with configure --disable-ms-windows"
-#define BOOST_REGEX_FI_WIN32_MAP
-#define BOOST_REGEX_FI_POSIX_DIR
-#elif (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32)
+#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32)
#define BOOST_REGEX_FI_WIN32_MAP
#define BOOST_REGEX_FI_WIN32_DIR
#else