--- code/trunk/internal.h 2007/02/24 21:38:01 3 +++ code/trunk/internal.h 2007/02/24 21:38:13 9 @@ -3,7 +3,7 @@ *************************************************/ -#define PCRE_VERSION "1.00 18-Nov-1997" +#define PCRE_VERSION "1.03 18-Dec-1997" /* This is a library of functions to support regular expressions whose syntax @@ -38,6 +38,7 @@ define a macro for memmove() if USE_BCOPY is defined. */ #ifdef USE_BCOPY +#undef memmove /* some systems may have a macro */ #define memmove(a, b, c) bcopy(b, a, c) #endif @@ -52,6 +53,13 @@ #include #include "pcre.h" +/* In case there is no definition of offsetof() provided - though any proper +Standard C system should have one. */ + +#ifndef offsetof +#define offsetof(p_type,field) ((size_t)&(((p_type)0)->field)) +#endif + /* Private options flags start at the most significant end of the two bytes. The public options defined in pcre.h start at the least significant end. Make sure they don't overlap! */ @@ -108,7 +116,7 @@ /* Opcode table: OP_BRA must be last, as all values >= it are used for brackets that extract substrings. Starting from 1 (i.e. after OP_END), the values up to -OP_EOL must correspond in order to the list of escapes immediately above. */ +OP_EOD must correspond in order to the list of escapes immediately above. */ enum { OP_END, /* End of pattern */ @@ -125,8 +133,7 @@ OP_NOT_WORDCHAR, /* \W */ OP_WORDCHAR, /* \w */ OP_CUT, /* The analogue of Prolog's "cut" operation (extension) */ - OP_EOD, /* End of data: or \Z. This must always be the last - of the backslashed meta values. */ + OP_EOD, /* End of data: \Z. */ OP_CIRC, /* Start of line - varies with multiline switch */ OP_DOLL, /* End of line - varies with multiline switch */