annotate auto/lib/pcre/patch.pcre.in @ 110:dad2fe8ecf08 NGINX_0_3_2

nginx 0.3.2 *) Feature: the Sun Studio 10 C compiler support. *) Feature: the "proxy_upstream_max_fails", "proxy_upstream_fail_timeout", "fastcgi_upstream_max_fails", and "fastcgi_upstream_fail_timeout" directives.
author Igor Sysoev <http://sysoev.ru>
date Wed, 12 Oct 2005 00:00:00 +0400
parents 0d75d65c642f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1 --- pcre.in Thu Aug 21 14:43:07 2003
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
2 +++ pcre.h Tue Mar 22 12:56:59 2005
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
3 @@ -10,9 +10,9 @@
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
4 /* The file pcre.h is build by "configure". Do not edit it; instead
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
5 make changes to pcre.in. */
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7 -#define PCRE_MAJOR @PCRE_MAJOR@
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
8 -#define PCRE_MINOR @PCRE_MINOR@
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9 -#define PCRE_DATE @PCRE_DATE@
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10 +#define PCRE_MAJOR 4
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
11 +#define PCRE_MINOR 4
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
12 +#define PCRE_DATE 21-August-2003
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
13
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14 /* Win32 uses DLL by default */
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
16 @@ -143,8 +143,8 @@
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
17 have to be different again. */
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
18
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
19 #ifndef VPCOMPAT
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
20 -PCRE_DATA_SCOPE void *(*pcre_malloc)(size_t);
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
21 -PCRE_DATA_SCOPE void (*pcre_free)(void *);
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
22 +PCRE_DATA_SCOPE void *(__cdecl *pcre_malloc)(size_t);
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
23 +PCRE_DATA_SCOPE void (__cdecl *pcre_free)(void *);
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
24 PCRE_DATA_SCOPE int (*pcre_callout)(pcre_callout_block *);
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
25 #else /* VPCOMPAT */
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
26 extern void *pcre_malloc(size_t);