diff --git a/include/boost/regex/detail/fileiter.hpp b/include/boost/regex/detail/fileiter.hpp
index b3fa6c2f..50a8a44f 100644
--- a/include/boost/regex/detail/fileiter.hpp
+++ b/include/boost/regex/detail/fileiter.hpp
@@ -333,7 +333,7 @@ public:
    typedef const char*               value_type;
    typedef const char**              pointer;
    typedef const char*&              reference;
-   typedef std::input_iterator_tag   category;
+   typedef std::input_iterator_tag   iterator_category;
 
    file_iterator();
    file_iterator(const char* wild);
@@ -380,7 +380,7 @@ public:
    typedef const char*               value_type;
    typedef const char**              pointer;
    typedef const char*&              reference;
-   typedef std::input_iterator_tag   category;
+   typedef std::input_iterator_tag   iterator_category;
 
    directory_iterator();
    directory_iterator(const char* wild);
@@ -443,3 +443,4 @@ using boost::re_detail::mapfile;
 
 
 
+
diff --git a/include/boost/regex/detail/regex_config.hpp b/include/boost/regex/detail/regex_config.hpp
index ebe461af..f40f3fe4 100644
--- a/include/boost/regex/detail/regex_config.hpp
+++ b/include/boost/regex/detail/regex_config.hpp
@@ -307,7 +307,7 @@ full list of macros and their usage.
 #   endif
 #endif
 
-#if defined(_REENTRANT) || defined(_PTHREADS)
+#if (defined(_REENTRANT) || defined(_PTHREADS)) && !defined(_NOTHREADS)
 //
 // Several compilers define _REENTRANT or 
 // _PTHREADS when threading support is turned on: