--- code/trunk/pcre_info.c 2007/02/24 21:41:13 85 +++ code/trunk/pcre_info.c 2007/09/10 13:23:56 230 @@ -6,7 +6,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel - Copyright (c) 1997-2005 University of Cambridge + Copyright (c) 1997-2007 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -43,6 +43,10 @@ deprecated, as it has been superseded by pcre_fullinfo(). */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "pcre_internal.h" @@ -68,7 +72,7 @@ or negative values on error */ -PCRE_EXPORT int +PCRE_EXP_DEFN int pcre_info(const pcre *argument_re, int *optptr, int *first_byte) { real_pcre internal_re; @@ -81,8 +85,8 @@ } if (optptr != NULL) *optptr = (int)(re->options & PUBLIC_OPTIONS); if (first_byte != NULL) - *first_byte = ((re->options & PCRE_FIRSTSET) != 0)? re->first_byte : - ((re->options & PCRE_STARTLINE) != 0)? -1 : -2; + *first_byte = ((re->flags & PCRE_FIRSTSET) != 0)? re->first_byte : + ((re->flags & PCRE_STARTLINE) != 0)? -1 : -2; return re->top_bracket; }