Merge branch 'feature/upstream' into develop

1 files changed, 25 insertions, 3 deletions

diff --git a/src/regposerr.c b/src/regposerr.c
index 12d95a9..e5b7899 100644
--- a/src/regposerr.c
+++ b/src/regposerr.c
@@ -37,6 +37,18 @@
 #include "config.h"
 #include "onigposix.h"
 
+#undef regex_t
+#undef regmatch_t
+#undef regoff_t
+#undef regcomp
+#undef regexec
+#undef regfree
+#undef regerror
+#undef reg_set_encoding
+#undef reg_name_to_group_numbers
+#undef reg_foreach_name
+#undef reg_number_of_names
+
 #ifndef ONIG_NO_STANDARD_C_HEADERS
 #include <string.h>
 #include <stdio.h>
@@ -92,10 +104,9 @@ static char* ESTRING[] = {
 };
 
 
-
 extern size_t
-regerror(int posix_ecode, const regex_t* reg ARG_UNUSED, char* buf,
-         size_t size)
+onig_posix_regerror(int posix_ecode, const onig_posix_regex_t* reg ARG_UNUSED,
+                    char* buf, size_t size)
 {
   char* s;
   char tbuf[35];
@@ -121,3 +132,14 @@ regerror(int posix_ecode, const regex_t* reg ARG_UNUSED, char* buf,
   }
   return len;
 }
+
+#ifdef USE_BINARY_COMPATIBLE_POSIX_API
+
+extern size_t
+regerror(int posix_ecode, const onig_posix_regex_t* reg ARG_UNUSED,
+         char* buf, size_t size)
+{
+  return onig_posix_regerror(posix_ecode, reg, buf, size);
+}
+
+#endif