archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid Apache's regex.h, if system regex was chosen

Browse source
This commit is contained in:
Sascha Schumann 1999-11-30 23:19:33 +00:00
parent b9e59b296d
commit 00f8f24d74
2 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/ereg/php_regex.h
View file

@ -1,6 +1,13 @@
#ifndef _PHP_REGEX_H #ifndef _PHP_REGEX_H
#define _PHP_REGEX_H #define _PHP_REGEX_H
/*
* REGEX means:
* 0.. system regex
* 1.. bundled regex
* 2.. Apache's regex
*/
#if REGEX == 1 #if REGEX == 1
/* get aliases */ /* get aliases */
#include "regex/regex_extra.h" #include "regex/regex_extra.h"
@ -28,6 +35,9 @@
#endif #endif
#elif REGEX == 0 #elif REGEX == 0
#include <regex.h> #include <regex.h>
#ifndef _REGEX_H_
#define _REGEX_H_ 1
#endif
#endif #endif
#endif /* _PHP_REGEX_H */ #endif /* _PHP_REGEX_H */

10
main/php_regex.h
View file

@ -1,6 +1,13 @@
#ifndef _PHP_REGEX_H #ifndef _PHP_REGEX_H
#define _PHP_REGEX_H #define _PHP_REGEX_H
/*
* REGEX means:
* 0.. system regex
* 1.. bundled regex
* 2.. Apache's regex
*/
#if REGEX == 1 #if REGEX == 1
/* get aliases */ /* get aliases */
#include "regex/regex_extra.h" #include "regex/regex_extra.h"
@ -28,6 +35,9 @@
#endif #endif
#elif REGEX == 0 #elif REGEX == 0
#include <regex.h> #include <regex.h>
#ifndef _REGEX_H_
#define _REGEX_H_ 1
#endif
#endif #endif
#endif /* _PHP_REGEX_H */ #endif /* _PHP_REGEX_H */