|
5 | 5 | /* This is the public header file for the PCRE library, second API, to be |
6 | 6 | #included by applications that call PCRE2 functions. |
7 | 7 |
|
8 | | - Copyright (c) 2016-2017 University of Cambridge |
| 8 | + Copyright (c) 2016-2018 University of Cambridge |
9 | 9 |
|
10 | 10 | ----------------------------------------------------------------------------- |
11 | 11 | Redistribution and use in source and binary forms, with or without |
@@ -41,10 +41,16 @@ POSSIBILITY OF SUCH DAMAGE. |
41 | 41 |
|
42 | 42 | /* The current PCRE version information. */ |
43 | 43 |
|
44 | | -#define PCRE2_MAJOR 10 |
45 | | -#define PCRE2_MINOR 31 |
46 | | -#define PCRE2_PRERELEASE |
47 | | -#define PCRE2_DATE 2018-02-12 |
| 44 | +#define PCRE2_MAJOR 10 |
| 45 | +#define PCRE2_MINOR 32 |
| 46 | +#define PCRE2_PRERELEASE |
| 47 | +#define PCRE2_DATE 2018-09-10 |
| 48 | + |
| 49 | +/* For the benefit of systems without stdint.h, an alternative is to use |
| 50 | +inttypes.h. The existence of these headers is checked by configure or CMake. */ |
| 51 | + |
| 52 | +#define PCRE2_HAVE_STDINT_H 1 |
| 53 | +#define PCRE2_HAVE_INTTYPES_H 1 |
48 | 54 |
|
49 | 55 | /* When an application links to a PCRE DLL in Windows, the symbols that are |
50 | 56 | imported have to be identified as such. When building PCRE2, the appropriate |
@@ -81,12 +87,18 @@ set, we ensure here that it has no effect. */ |
81 | 87 | #define PCRE2_CALL_CONVENTION |
82 | 88 | #endif |
83 | 89 |
|
84 | | -/* Have to include limits.h, stdlib.h and stdint.h to ensure that size_t and |
85 | | -uint8_t, UCHAR_MAX, etc are defined. */ |
| 90 | +/* Have to include limits.h, stdlib.h and stdint.h (or inttypes.h) to ensure |
| 91 | +that size_t and uint8_t, UCHAR_MAX, etc are defined. If the system has neither |
| 92 | +header, the relevant values must be provided by some other means. */ |
86 | 93 |
|
87 | 94 | #include <limits.h> |
88 | 95 | #include <stdlib.h> |
| 96 | + |
| 97 | +#if PCRE2_HAVE_STDINT_H |
89 | 98 | #include <stdint.h> |
| 99 | +#elif PCRE2_HAVE_INTTYPES_H |
| 100 | +#include <inttypes.h> |
| 101 | +#endif |
90 | 102 |
|
91 | 103 | /* Allow for C++ users compiling this directly. */ |
92 | 104 |
|
@@ -269,6 +281,7 @@ pcre2_pattern_convert(). */ |
269 | 281 | #define PCRE2_ERROR_INTERNAL_UNKNOWN_NEWLINE 156 |
270 | 282 | #define PCRE2_ERROR_BACKSLASH_G_SYNTAX 157 |
271 | 283 | #define PCRE2_ERROR_PARENS_QUERY_R_MISSING_CLOSING 158 |
| 284 | +/* Error 159 is obsolete and should now never occur */ |
272 | 285 | #define PCRE2_ERROR_VERB_ARGUMENT_NOT_ALLOWED 159 |
273 | 286 | #define PCRE2_ERROR_VERB_UNKNOWN 160 |
274 | 287 | #define PCRE2_ERROR_SUBPATTERN_NUMBER_TOO_BIG 161 |
@@ -303,6 +316,8 @@ pcre2_pattern_convert(). */ |
303 | 316 | #define PCRE2_ERROR_INTERNAL_BAD_CODE_IN_SKIP 190 |
304 | 317 | #define PCRE2_ERROR_NO_SURROGATES_IN_UTF16 191 |
305 | 318 | #define PCRE2_ERROR_BAD_LITERAL_OPTIONS 192 |
| 319 | +#define PCRE2_ERROR_SUPPORTED_ONLY_IN_UNICODE 193 |
| 320 | +#define PCRE2_ERROR_INVALID_HYPHEN_IN_OPTIONS 194 |
306 | 321 |
|
307 | 322 |
|
308 | 323 | /* "Expected" matching error codes: no match and partial match. */ |
@@ -387,6 +402,7 @@ released, the numbers must not be changed. */ |
387 | 402 | #define PCRE2_ERROR_BADSERIALIZEDDATA (-62) |
388 | 403 | #define PCRE2_ERROR_HEAPLIMIT (-63) |
389 | 404 | #define PCRE2_ERROR_CONVERT_SYNTAX (-64) |
| 405 | +#define PCRE2_ERROR_INTERNAL_DUPMATCH (-65) |
390 | 406 |
|
391 | 407 |
|
392 | 408 | /* Request types for pcre2_pattern_info() */ |
|
0 commit comments