Merge branch 'master' into win32-x64-working

2015-06-17 19:39:24 -04:00
parent 598ee94628 1df377b951
commit 72a0841dbb
6 changed files with 97 additions and 60 deletions
--- a/sys/share/cppregex.cpp
+++ b/sys/share/cppregex.cpp
@@ -10,7 +10,7 @@
 extern "C" {
  #include <hack.h>

-  char regex_id[] = "cppregex";
+  extern const char regex_id[] = "cppregex";

  struct nhregex {
    std::unique_ptr<std::regex> re;