--- a/src/regex.c	Mon Aug 13 11:38:26 2007 +0200
+++ b/src/regex.c	Mon Aug 13 11:39:20 2007 +0200
@@ -4157,7 +4157,7 @@
 
 /* Call before fetching a character with *d.  This switches over to
    string2 if necessary.  */
-#define PREFETCH()							\
+#define REGEX_PREFETCH()							\
   while (d == dend)						    	\
     {									\
       /* End of string2 => fail.  */					\
@@ -4699,7 +4699,7 @@
 		  Emchar pat_ch, buf_ch;
 		  Bytecount pat_len;
 
-		  PREFETCH ();
+		  REGEX_PREFETCH ();
 		  pat_ch = charptr_emchar (p);
 		  buf_ch = charptr_emchar (d);
 		  if (RE_TRANSLATE (buf_ch) != pat_ch)
@@ -4711,7 +4711,7 @@
 		  
 		  mcnt -= pat_len;
 #else /* not MULE */
-		  PREFETCH ();
+		  REGEX_PREFETCH ();
 		  if ((unsigned char) RE_TRANSLATE (*d++) != *p++)
                     goto fail;
 		  mcnt--;
@@ -4723,7 +4723,7 @@
 	    {
 	      do
 		{
-		  PREFETCH ();
+		  REGEX_PREFETCH ();
 		  if (*d++ != *p++) goto fail;
 		}
 	      while (--mcnt);
@@ -4736,7 +4736,7 @@
 	case anychar:
           DEBUG_PRINT1 ("EXECUTING anychar.\n");
 
-          PREFETCH ();
+          REGEX_PREFETCH ();
 
           if ((!(bufp->syntax & RE_DOT_NEWLINE) && TRANSLATE (*d) == '\n')
               || (bufp->syntax & RE_DOT_NOT_NULL && TRANSLATE (*d) == '\000'))
@@ -4756,7 +4756,7 @@
 
             DEBUG_PRINT2 ("EXECUTING charset%s.\n", not ? "_not" : "");
 
-	    PREFETCH ();
+	    REGEX_PREFETCH ();
 	    c = TRANSLATE (*d); /* The character to match.  */
 
             /* Cast to `unsigned' instead of `unsigned char' in case the
@@ -4783,7 +4783,7 @@
 
             DEBUG_PRINT2 ("EXECUTING charset_mule%s.\n", not ? "_not" : "");
 
-	    PREFETCH ();
+	    REGEX_PREFETCH ();
 	    c = charptr_emchar ((const Bufbyte *) d);
 	    c = TRANSLATE_EXTENDED_UNSAFE (c); /* The character to match.  */
 
@@ -5035,7 +5035,7 @@
 		if (d2 == dend2) break;
 
 		/* If necessary, advance to next segment in data.  */
-		PREFETCH ();
+		REGEX_PREFETCH ();
 
 		/* How many characters left in this segment to match.  */
 		mcnt = dend - d;
@@ -5594,7 +5594,7 @@
 	    int matches;
 	    Emchar emch;
 
-	    PREFETCH ();
+	    REGEX_PREFETCH ();
 	    emch = charptr_emchar ((const Bufbyte *) d);
 	    matches = (SYNTAX_UNSAFE
 		       (XCHAR_TABLE (regex_emacs_buffer->mirror_syntax_table),
@@ -5627,7 +5627,7 @@
 	    Emchar emch;
 
 	    mcnt = *p++;
-	    PREFETCH ();
+	    REGEX_PREFETCH ();
 	    emch = charptr_emchar ((const Bufbyte *) d);
 	    INC_CHARPTR (d);
 	    if (check_category_char(emch, regex_emacs_buffer->category_table,
@@ -5645,7 +5645,7 @@
 #else /* not emacs */
 	case wordchar:
           DEBUG_PRINT1 ("EXECUTING non-Emacs wordchar.\n");
-	  PREFETCH ();
+	  REGEX_PREFETCH ();
           if (!WORDCHAR_P_UNSAFE ((int) (*d)))
             goto fail;
 	  SET_REGS_MATCHED ();
@@ -5654,7 +5654,7 @@
 
 	case notwordchar:
           DEBUG_PRINT1 ("EXECUTING non-Emacs notwordchar.\n");
-	  PREFETCH ();
+	  REGEX_PREFETCH ();
           if (!WORDCHAR_P_UNSAFE ((int) (*d)))
             goto fail;
           SET_REGS_MATCHED ();