Merge branch 'pan/update_pcre_8.33'

* pan/update_pcre_8.33:
  Workaround TR gnu/181328, GCC 4.2.1 20070831 on FreeBSD 9.1
  Clarify relation between erts_iolist_{size|to_buf}
  Fix backslash in titles of manpages
  Correct UTF-8 in stdlib's notes.xml
  Add more tests for corner error cases in erl_bif_re.c
  Add documentation of report_errors and match_limit(_recursion)
  Add match_limit and match_limit_recursion options
  Add return_errors option to re:run/3
  Add README for updating PCRE
  Add documentation of extensions to re module
  Add new options to Erlang re interface and mend dupnames
  Update PCRE doc part of re.xml to PCRE 8.33 state
  Integrate new PCRE test suites
  Integrate patch for PCRE bug id 1370
  Handle CRLF correctly in global regexp
  Add erts_prefix to pcre_library and update erl_bif_re
  Update to PCRE 8.33, w/o the erts_ prefix added

OTP-11204
OTP-11205
OTP-10285

1 files changed, 19 insertions, 4 deletions

diff --git a/erts/emulator/pcre/pcre_refcount.c b/erts/emulator/pcre/pcre_refcount.c
index a2077b9d52..33d5a528af 100644
--- a/erts/emulator/pcre/pcre_refcount.c
+++ b/erts/emulator/pcre/pcre_refcount.c
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2008 University of Cambridge
+           Copyright (c) 1997-2012 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 
-/* This module contains the external function erts_pcre_refcount(), which is an
+/* This module contains the external function pcre_refcount(), which is an
 auxiliary function that can be used to maintain a reference count in a compiled
 pattern data block. This might be helpful in applications where the block is
 shared by different users. */
@@ -69,11 +69,26 @@ Returns:        the (possibly updated) count value (a non-negative number), or
                 a negative error number
 */
 
-PCRE_EXP_DEFN int
+#if defined COMPILE_PCRE8
+#if defined(ERLANG_INTEGRATION)
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 erts_pcre_refcount(pcre *argument_re, int adjust)
+#else
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
+pcre_refcount(pcre *argument_re, int adjust)
+#endif
+#elif defined COMPILE_PCRE16
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
+pcre16_refcount(pcre16 *argument_re, int adjust)
+#elif defined COMPILE_PCRE32
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
+pcre32_refcount(pcre32 *argument_re, int adjust)
+#endif
 {
-real_pcre *re = (real_pcre *)argument_re;
+REAL_PCRE *re = (REAL_PCRE *)argument_re;
 if (re == NULL) return PCRE_ERROR_NULL;
+if (re->magic_number != MAGIC_NUMBER) return PCRE_ERROR_BADMAGIC;
+if ((re->flags & PCRE_MODE) == 0) return PCRE_ERROR_BADMODE;
 re->ref_count = (-adjust > re->ref_count)? 0 :
                 (adjust + re->ref_count > 65535)? 65535 :
                 re->ref_count + adjust;