Index: ext/ereg/php_regex.h =================================================================== RCS file: /repository/php-src/ext/ereg/php_regex.h,v retrieving revision 1.20.2.3 diff -u -p -r1.20.2.3 php_regex.h --- ext/ereg/php_regex.h 31 Dec 2007 07:17:07 -0000 1.20.2.3 +++ ext/ereg/php_regex.h 11 Aug 2008 08:56:29 -0000 @@ -34,7 +34,7 @@ #define regfree php_regfree #define regcomp php_regcomp -#include "ext/ereg/regex/regex.h" +#include "ext/ereg/regex/int_regex.h" #undef _PCREPOSIX_H #define _PCREPOSIX_H 1 Index: ext/ereg/regex/debug.c =================================================================== RCS file: /repository/php-src/ext/ereg/regex/debug.c,v retrieving revision 1.2.8.2 diff -u -p -r1.2.8.2 debug.c --- ext/ereg/regex/debug.c 5 Oct 2007 15:00:06 -0000 1.2.8.2 +++ ext/ereg/regex/debug.c 11 Aug 2008 08:56:29 -0000 @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include "utils.h" #include "regex2.h" Index: ext/ereg/regex/int_regex.h =================================================================== RCS file: ext/ereg/regex/int_regex.h diff -N ext/ereg/regex/int_regex.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ext/ereg/regex/int_regex.h 11 Aug 2008 08:56:30 -0000 @@ -0,0 +1,85 @@ +#ifndef _HSREGEX_H_ +#define _HSREGEX_H_ +#ifndef _HSREGEX_H +#define _HSREGEX_H /* never again */ +/* ========= begin header generated by ././mkh ========= */ +#ifdef __cplusplus +extern "C" { +#endif + +/* === regex2.h === */ +#ifdef WIN32 +#define API_EXPORT(type) __declspec(dllexport) type __stdcall +#elif defined(__GNUC__) && __GNUC__ >= 4 +#define API_EXPORT(type) __attribute__ ((visibility("default"))) type +#else +#define API_EXPORT(type) type +#endif + +typedef off_t regoff_t; +typedef struct { + int re_magic; + size_t re_nsub; /* number of parenthesized subexpressions */ + const char *re_endp; /* end pointer for REG_PEND */ + struct re_guts *re_g; /* none of your business :-) */ +} regex_t; +typedef struct { + regoff_t rm_so; /* start of match */ + regoff_t rm_eo; /* end of match */ +} regmatch_t; + + +/* === regcomp.c === */ +API_EXPORT(int) regcomp(regex_t *, const char *, int); +#define REG_BASIC 0000 +#define REG_EXTENDED 0001 +#define REG_ICASE 0002 +#define REG_NOSUB 0004 +#define REG_NEWLINE 0010 +#define REG_NOSPEC 0020 +#define REG_PEND 0040 +#define REG_DUMP 0200 + + +/* === regerror.c === */ +#define REG_OKAY 0 +#define REG_NOMATCH 1 +#define REG_BADPAT 2 +#define REG_ECOLLATE 3 +#define REG_ECTYPE 4 +#define REG_EESCAPE 5 +#define REG_ESUBREG 6 +#define REG_EBRACK 7 +#define REG_EPAREN 8 +#define REG_EBRACE 9 +#define REG_BADBR 10 +#define REG_ERANGE 11 +#define REG_ESPACE 12 +#define REG_BADRPT 13 +#define REG_EMPTY 14 +#define REG_ASSERT 15 +#define REG_INVARG 16 +#define REG_ATOI 255 /* convert name to number (!) */ +#define REG_ITOA 0400 /* convert number to name (!) */ +API_EXPORT(size_t) regerror(int, const regex_t *, char *, size_t); + + +/* === regexec.c === */ +API_EXPORT(int) regexec(const regex_t *, const char *, size_t, regmatch_t [], int); +#define REG_NOTBOL 00001 +#define REG_NOTEOL 00002 +#define REG_STARTEND 00004 +#define REG_TRACE 00400 /* tracing of execution */ +#define REG_LARGE 01000 /* force large representation */ +#define REG_BACKR 02000 /* force use of backref code */ + + +/* === regfree.c === */ +API_EXPORT(void) regfree(regex_t *); + +#ifdef __cplusplus +} +#endif +/* ========= end header generated by ././mkh ========= */ +#endif +#endif Index: ext/ereg/regex/main.c =================================================================== RCS file: /repository/php-src/ext/ereg/regex/main.c,v retrieving revision 1.1.1.1.38.2 diff -u -p -r1.1.1.1.38.2 main.c --- ext/ereg/regex/main.c 5 Oct 2007 15:00:06 -0000 1.1.1.1.38.2 +++ ext/ereg/regex/main.c 11 Aug 2008 08:56:30 -0000 @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include Index: ext/ereg/regex/regcomp.c =================================================================== RCS file: /repository/php-src/ext/ereg/regex/regcomp.c,v retrieving revision 1.7.2.2 diff -u -p -r1.7.2.2 regcomp.c --- ext/ereg/regex/regcomp.c 5 Oct 2007 15:00:06 -0000 1.7.2.2 +++ ext/ereg/regex/regcomp.c 11 Aug 2008 08:56:30 -0000 @@ -8,7 +8,7 @@ #define POSIX_MISTAKE #include "utils.h" -#include "regex.h" +#include "int_regex.h" #include "regex2.h" #include "cclass.h" Index: ext/ereg/regex/regerror.c =================================================================== RCS file: /repository/php-src/ext/ereg/regex/regerror.c,v retrieving revision 1.6.6.4 diff -u -p -r1.6.6.4 regerror.c --- ext/ereg/regex/regerror.c 25 Jan 2008 20:11:53 -0000 1.6.6.4 +++ ext/ereg/regex/regerror.c 11 Aug 2008 08:56:30 -0000 @@ -5,7 +5,7 @@ #include #include -#include "regex.h" +#include "int_regex.h" #include "utils.h" #include "regerror.ih" Index: ext/ereg/regex/regex.h =================================================================== RCS file: ext/ereg/regex/regex.h diff -N ext/ereg/regex/regex.h --- ext/ereg/regex/regex.h 21 Jul 2008 16:23:00 -0000 1.6.36.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,85 +0,0 @@ -#ifndef _HSREGEX_H_ -#define _HSREGEX_H_ -#ifndef _HSREGEX_H -#define _HSREGEX_H /* never again */ -/* ========= begin header generated by ././mkh ========= */ -#ifdef __cplusplus -extern "C" { -#endif - -/* === regex2.h === */ -#ifdef WIN32 -#define API_EXPORT(type) __declspec(dllexport) type __stdcall -#elif defined(__GNUC__) && __GNUC__ >= 4 -#define API_EXPORT(type) __attribute__ ((visibility("default"))) type -#else -#define API_EXPORT(type) type -#endif - -typedef off_t regoff_t; -typedef struct { - int re_magic; - size_t re_nsub; /* number of parenthesized subexpressions */ - const char *re_endp; /* end pointer for REG_PEND */ - struct re_guts *re_g; /* none of your business :-) */ -} regex_t; -typedef struct { - regoff_t rm_so; /* start of match */ - regoff_t rm_eo; /* end of match */ -} regmatch_t; - - -/* === regcomp.c === */ -API_EXPORT(int) regcomp(regex_t *, const char *, int); -#define REG_BASIC 0000 -#define REG_EXTENDED 0001 -#define REG_ICASE 0002 -#define REG_NOSUB 0004 -#define REG_NEWLINE 0010 -#define REG_NOSPEC 0020 -#define REG_PEND 0040 -#define REG_DUMP 0200 - - -/* === regerror.c === */ -#define REG_OKAY 0 -#define REG_NOMATCH 1 -#define REG_BADPAT 2 -#define REG_ECOLLATE 3 -#define REG_ECTYPE 4 -#define REG_EESCAPE 5 -#define REG_ESUBREG 6 -#define REG_EBRACK 7 -#define REG_EPAREN 8 -#define REG_EBRACE 9 -#define REG_BADBR 10 -#define REG_ERANGE 11 -#define REG_ESPACE 12 -#define REG_BADRPT 13 -#define REG_EMPTY 14 -#define REG_ASSERT 15 -#define REG_INVARG 16 -#define REG_ATOI 255 /* convert name to number (!) */ -#define REG_ITOA 0400 /* convert number to name (!) */ -API_EXPORT(size_t) regerror(int, const regex_t *, char *, size_t); - - -/* === regexec.c === */ -API_EXPORT(int) regexec(const regex_t *, const char *, size_t, regmatch_t [], int); -#define REG_NOTBOL 00001 -#define REG_NOTEOL 00002 -#define REG_STARTEND 00004 -#define REG_TRACE 00400 /* tracing of execution */ -#define REG_LARGE 01000 /* force large representation */ -#define REG_BACKR 02000 /* force use of backref code */ - - -/* === regfree.c === */ -API_EXPORT(void) regfree(regex_t *); - -#ifdef __cplusplus -} -#endif -/* ========= end header generated by ././mkh ========= */ -#endif -#endif Index: ext/ereg/regex/regexec.c =================================================================== RCS file: /repository/php-src/ext/ereg/regex/regexec.c,v retrieving revision 1.4.6.3 diff -u -p -r1.4.6.3 regexec.c --- ext/ereg/regex/regexec.c 24 Jan 2008 23:02:07 -0000 1.4.6.3 +++ ext/ereg/regex/regexec.c 11 Aug 2008 08:56:30 -0000 @@ -12,7 +12,7 @@ #include #include -#include "regex.h" +#include "int_regex.h" #include "utils.h" #include "regex2.h" Index: ext/ereg/regex/regfree.c =================================================================== RCS file: /repository/php-src/ext/ereg/regex/regfree.c,v retrieving revision 1.1.1.1.38.3 diff -u -p -r1.1.1.1.38.3 regfree.c --- ext/ereg/regex/regfree.c 24 Jan 2008 23:02:07 -0000 1.1.1.1.38.3 +++ ext/ereg/regex/regfree.c 11 Aug 2008 08:56:30 -0000 @@ -2,7 +2,7 @@ #include #include -#include "regex.h" +#include "int_regex.h" #include "utils.h" #include "regex2.h"