--- code/trunk/pcre_dfa_exec.c	2007/03/26 15:09:47	130
+++ code/trunk/pcre_dfa_exec.c	2007/04/04 14:06:52	145
@@ -2073,7 +2073,7 @@
                  < -1 => some kind of unexpected problem
 */
 
-PCRE_DATA_SCOPE int
+PCRE_EXP_DEFN int
 pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,
   const char *subject, int length, int start_offset, int options, int *offsets,
   int offsetcount, int *workspace, int wscount)
@@ -2166,7 +2166,7 @@
 /* Handle different types of newline. The three bits give eight cases. If
 nothing is set at run time, whatever was used at compile time applies. */
 
-switch ((((options & PCRE_NEWLINE_BITS) == 0)? re->options : options) &
+switch ((((options & PCRE_NEWLINE_BITS) == 0)? re->options : (pcre_uint32)options) &
          PCRE_NEWLINE_BITS)
   {
   case 0: newline = NEWLINE; break;   /* Compile-time default */
@@ -2311,7 +2311,7 @@
 
         /* If we have just passed a CR and the newline option is ANY, and we
         are now at a LF, advance the match position by one more character. */
-        
+
         if (current_subject[-1] == '\r' &&
              md->nltype == NLTYPE_ANY &&
              current_subject < end_subject &&