Skip to content

Commit 35fee41

Browse files
committed
Final file tidies for 10.39.
1 parent 3469b13 commit 35fee41

File tree

6 files changed

+66
-61
lines changed

6 files changed

+66
-61
lines changed

ChangeLog

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,47 +20,47 @@ Version 10.39 29-October-2021
2020
IMHO removing the cast (and therefore the positibilty of truncation)
2121
make the code cleaner and the fallback is likely portable enough
2222
with all 64-bit POSIX systems doing LP64 except for Windows.
23-
24-
3. Merged patch from @carenas (GitHub #29) to update to Unicode 14.0.0.
23+
24+
3. Merged patch from @carenas (GitHub #29) to update to Unicode 14.0.0.
2525

2626
4. Merged patch from @carenas (GitHub #30):
2727

2828
* Cleanup: remove references to no longer used stdint.h
29-
29+
3030
Since 19c50b9d (Unconditionally use inttypes.h instead of trying for stdint.h
3131
(simplification) and remove the now unnecessary inclusion in
3232
pcre2_internal.h., 2018-11-14), stdint.h is no longer used.
33-
33+
3434
Remove checks for it in autotools and CMake and document better the expected
3535
build failures for systems that might have stdint.h (C99) and not inttypes.h
3636
(from POSIX), like old Windows.
37-
37+
3838
* Cleanup: remove detection for inttypes.h which is a hard dependency
39-
39+
4040
CMake checks for standard headers are not meant to be used for hard
4141
dependencies, so will prevent a possible fallback to work.
42-
42+
4343
Alternatively, the header could be checked to make the configuration fail
4444
instead of breaking the build, but that was punted, as it was missing anyway
4545
from autotools.
46-
46+
4747
5. Merged patch from @carenas (GitHub #32):
4848

4949
* jit: allow building with ancient MSVC versions
50-
50+
5151
Visual Studio older than 2013 fails to build with JIT enabled, because it is
5252
unable to parse non C89 compatible syntax, with mixed declarations and code.
5353
While most recent compilers wouldn't even report this as a warning since it
5454
is valid C99, it could be also made visible by adding to gcc/clang the
5555
-Wdeclaration-after-statement flag at build time.
56-
56+
5757
Move the code below the affected definitions.
58-
58+
5959
* pcre2grep: avoid mixing declarations with code
60-
60+
6161
Since d5a61ee8 (Patch to detect (and ignore) symlink loops in pcre2grep,
6262
2021-08-28), code will fail to build in a strict C89 compiler.
63-
63+
6464
Reformat slightly to make it C89 compatible again.
6565

6666

doc/html/NON-AUTOTOOLS-BUILD.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,9 @@ cache can be deleted by selecting "File > Delete Cache".
344344
BUILDING PCRE2 ON WINDOWS WITH VISUAL STUDIO
345345

346346
The code currently cannot be compiled without an inttypes.h header, which is
347-
available only with Visual Studio 2013 or newer. However, this
348-
portable and permissively-licensed implementation of the stdint.h header
349-
could be used as an alternative:
347+
available only with Visual Studio 2013 or newer. However, this portable and
348+
permissively-licensed implementation of the stdint.h header could be used as an
349+
alternative:
350350

351351
http://www.azillionmonkeys.com/qed/pstdint.h
352352

doc/html/README.txt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ PCRE2 is a re-working of the original PCRE1 library to provide an entirely new
55
API. Since its initial release in 2015, there has been further development of
66
the code and it now differs from PCRE1 in more than just the API. There are new
77
features, and the internals have been improved. The original PCRE1 library is
8-
now obsolete and should not be used in new projects. The latest release of
9-
PCRE2 is available in .tar.gz, tar.bz2, or .zip form from this GitHub
10-
repository:
8+
now obsolete and no longer maintained. The latest release of PCRE2 is available
9+
in .tar.gz, tar.bz2, or .zip form from this GitHub repository:
1110

1211
https://github.com/PhilipHazel/pcre2/releases
1312

@@ -377,12 +376,12 @@ library. They are also documented in the pcre2build man page.
377376

378377
. The C99 standard defines formatting modifiers z and t for size_t and
379378
ptrdiff_t values, respectively. By default, PCRE2 uses these modifiers in
380-
environments other than Microsoft Visual Studio when __STDC_VERSION__ is
381-
defined and has a value greater than or equal to 199901L (indicating C99).
382-
However, there is at least one environment that claims to be C99 but does not
383-
support these modifiers. If --disable-percent-zt is specified, no use is made
384-
of the z or t modifiers. Instead of %td or %zu, %lu is used, with a cast for
385-
size_t values.
379+
environments other than Microsoft Visual Studio versions earlier than 2013
380+
when __STDC_VERSION__ is defined and has a value greater than or equal to
381+
199901L (indicating C99). However, there is at least one environment that
382+
claims to be C99 but does not support these modifiers. If
383+
--disable-percent-zt is specified, no use is made of the z or t modifiers.
384+
Instead of %td or %zu, %lu is used, with a cast for size_t values.
386385

387386
. There is a special option called --enable-fuzz-support for use by people who
388387
want to run fuzzing tests on PCRE2. At present this applies only to the 8-bit
@@ -906,4 +905,4 @@ The distribution should contain the files listed below.
906905
Philip Hazel
907906
Email local part: Philip.Hazel
908907
Email domain: gmail.com
909-
Last updated: 27 August 2021
908+
Last updated: 29 October 2021

doc/pcre2.txt

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ REVISION
185185
Last updated: 27 August 2021
186186
Copyright (c) 1997-2021 University of Cambridge.
187187
------------------------------------------------------------------------------
188-
189-
188+
189+
190190
PCRE2API(3) Library Functions Manual PCRE2API(3)
191191

192192

@@ -3851,8 +3851,8 @@ REVISION
38513851
Last updated: 30 August 2021
38523852
Copyright (c) 1997-2021 University of Cambridge.
38533853
------------------------------------------------------------------------------
3854-
3855-
3854+
3855+
38563856
PCRE2BUILD(3) Library Functions Manual PCRE2BUILD(3)
38573857

38583858

@@ -4447,8 +4447,8 @@ REVISION
44474447
Last updated: 20 March 2020
44484448
Copyright (c) 1997-2020 University of Cambridge.
44494449
------------------------------------------------------------------------------
4450-
4451-
4450+
4451+
44524452
PCRE2CALLOUT(3) Library Functions Manual PCRE2CALLOUT(3)
44534453

44544454

@@ -4877,8 +4877,8 @@ REVISION
48774877
Last updated: 03 February 2019
48784878
Copyright (c) 1997-2019 University of Cambridge.
48794879
------------------------------------------------------------------------------
4880-
4881-
4880+
4881+
48824882
PCRE2COMPAT(3) Library Functions Manual PCRE2COMPAT(3)
48834883

48844884

@@ -5092,8 +5092,8 @@ REVISION
50925092
Last updated: 30 August 2021
50935093
Copyright (c) 1997-2021 University of Cambridge.
50945094
------------------------------------------------------------------------------
5095-
5096-
5095+
5096+
50975097
PCRE2JIT(3) Library Functions Manual PCRE2JIT(3)
50985098

50995099

@@ -5518,8 +5518,8 @@ REVISION
55185518
Last updated: 23 May 2019
55195519
Copyright (c) 1997-2019 University of Cambridge.
55205520
------------------------------------------------------------------------------
5521-
5522-
5521+
5522+
55235523
PCRE2LIMITS(3) Library Functions Manual PCRE2LIMITS(3)
55245524

55255525

@@ -5588,8 +5588,8 @@ REVISION
55885588
Last updated: 02 February 2019
55895589
Copyright (c) 1997-2019 University of Cambridge.
55905590
------------------------------------------------------------------------------
5591-
5592-
5591+
5592+
55935593
PCRE2MATCHING(3) Library Functions Manual PCRE2MATCHING(3)
55945594

55955595

@@ -5813,8 +5813,8 @@ REVISION
58135813
Last updated: 28 August 2021
58145814
Copyright (c) 1997-2021 University of Cambridge.
58155815
------------------------------------------------------------------------------
5816-
5817-
5816+
5817+
58185818
PCRE2PARTIAL(3) Library Functions Manual PCRE2PARTIAL(3)
58195819

58205820

@@ -6193,8 +6193,8 @@ REVISION
61936193
Last updated: 04 September 2019
61946194
Copyright (c) 1997-2019 University of Cambridge.
61956195
------------------------------------------------------------------------------
6196-
6197-
6196+
6197+
61986198
PCRE2PATTERN(3) Library Functions Manual PCRE2PATTERN(3)
61996199

62006200

@@ -9643,8 +9643,8 @@ REVISION
96439643
Last updated: 30 August 2021
96449644
Copyright (c) 1997-2021 University of Cambridge.
96459645
------------------------------------------------------------------------------
9646-
9647-
9646+
9647+
96489648
PCRE2PERFORM(3) Library Functions Manual PCRE2PERFORM(3)
96499649

96509650

@@ -9878,8 +9878,8 @@ REVISION
98789878
Last updated: 03 February 2019
98799879
Copyright (c) 1997-2019 University of Cambridge.
98809880
------------------------------------------------------------------------------
9881-
9882-
9881+
9882+
98839883
PCRE2POSIX(3) Library Functions Manual PCRE2POSIX(3)
98849884

98859885

@@ -10212,8 +10212,8 @@ REVISION
1021210212
Last updated: 26 April 2021
1021310213
Copyright (c) 1997-2021 University of Cambridge.
1021410214
------------------------------------------------------------------------------
10215-
10216-
10215+
10216+
1021710217
PCRE2SAMPLE(3) Library Functions Manual PCRE2SAMPLE(3)
1021810218

1021910219

@@ -10491,8 +10491,8 @@ REVISION
1049110491
Last updated: 27 June 2018
1049210492
Copyright (c) 1997-2018 University of Cambridge.
1049310493
------------------------------------------------------------------------------
10494-
10495-
10494+
10495+
1049610496
PCRE2SYNTAX(3) Library Functions Manual PCRE2SYNTAX(3)
1049710497

1049810498

@@ -11011,8 +11011,8 @@ REVISION
1101111011
Last updated: 30 August 2021
1101211012
Copyright (c) 1997-2021 University of Cambridge.
1101311013
------------------------------------------------------------------------------
11014-
11015-
11014+
11015+
1101611016
PCRE2UNICODE(3) Library Functions Manual PCRE2UNICODE(3)
1101711017

1101811018

@@ -11446,5 +11446,5 @@ REVISION
1144611446
Last updated: 23 February 2020
1144711447
Copyright (c) 1997-2020 University of Cambridge.
1144811448
------------------------------------------------------------------------------
11449-
11450-
11449+
11450+

src/config.h.generic

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ sure both macros are undefined; an emulation function will then be used. */
7373
/* Define to 1 if you have the <edit/readline/readline.h> header file. */
7474
/* #undef HAVE_EDIT_READLINE_READLINE_H */
7575

76+
/* Define to 1 if you have the <inttypes.h> header file. */
77+
/* #undef HAVE_INTTYPES_H */
78+
7679
/* Define to 1 if you have the <limits.h> header file. */
7780
/* #undef HAVE_LIMITS_H */
7881

@@ -106,6 +109,9 @@ sure both macros are undefined; an emulation function will then be used. */
106109
/* Define to 1 if you have the `secure_getenv' function. */
107110
/* #undef HAVE_SECURE_GETENV */
108111

112+
/* Define to 1 if you have the <stdint.h> header file. */
113+
/* #undef HAVE_STDINT_H */
114+
109115
/* Define to 1 if you have the <stdio.h> header file. */
110116
/* #undef HAVE_STDIO_H */
111117

@@ -227,7 +233,7 @@ sure both macros are undefined; an emulation function will then be used. */
227233
#define PACKAGE_NAME "PCRE2"
228234

229235
/* Define to the full name and version of this package. */
230-
#define PACKAGE_STRING "PCRE2 10.38"
236+
#define PACKAGE_STRING "PCRE2 10.39"
231237

232238
/* Define to the one symbol short name of this package. */
233239
#define PACKAGE_TARNAME "pcre2"
@@ -236,7 +242,7 @@ sure both macros are undefined; an emulation function will then be used. */
236242
#define PACKAGE_URL ""
237243

238244
/* Define to the version of this package. */
239-
#define PACKAGE_VERSION "10.38"
245+
#define PACKAGE_VERSION "10.39"
240246

241247
/* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
242248
parentheses (of any kind) in a pattern. This limits the amount of system
@@ -429,7 +435,7 @@ sure both macros are undefined; an emulation function will then be used. */
429435
#endif
430436

431437
/* Version number of package */
432-
#define VERSION "10.38"
438+
#define VERSION "10.39"
433439

434440
/* Define to empty if `const' does not conform to ANSI C. */
435441
/* #undef const */

src/pcre2.h.generic

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
4242
/* The current PCRE version information. */
4343

4444
#define PCRE2_MAJOR 10
45-
#define PCRE2_MINOR 38
45+
#define PCRE2_MINOR 39
4646
#define PCRE2_PRERELEASE
47-
#define PCRE2_DATE 2021-10-01
47+
#define PCRE2_DATE 2021-10-29
4848

4949
/* When an application links to a PCRE DLL in Windows, the symbols that are
5050
imported have to be identified as such. When building PCRE2, the appropriate

0 commit comments

Comments
 (0)