--- a/src/redisplay.c	Mon Aug 13 09:13:58 2007 +0200
+++ b/src/redisplay.c	Mon Aug 13 09:15:11 2007 +0200
@@ -3661,7 +3661,7 @@
 
 static Charcount
 add_string_to_fstring_db_runes (pos_data *data, CONST Bufbyte *str,
-				Charcount pos, Charcount min, Charcount max)
+				Charcount pos, Charcount min_pos, Charcount max_pos)
 {
   /* This function has been Mule-ized. */
   Charcount end;
@@ -3674,8 +3674,8 @@
 
   end = (Dynarr_length (db->runes) +
 	 bytecount_to_charcount (str, strlen ((CONST char *) str)));
-  if (max != -1)
-    end = min (max, end);
+  if (max_pos != -1)
+    end = min (max_pos, end);
 
   while (pos < end && *cur_pos)
     {
@@ -3693,7 +3693,7 @@
 	}
     }
 
-  while (Dynarr_length (db->runes) < min &&
+  while (Dynarr_length (db->runes) < min_pos &&
 	 (data->pixpos + data->blank_width <= data->max_pixpos))
     add_blank_rune (data, NULL, 0);
 
@@ -3704,7 +3704,7 @@
    modeline extents. */
 static Charcount
 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
-			       Charcount pos, Charcount min, Charcount max)
+			       Charcount pos, Charcount min_pos, Charcount max_pos)
 {
   /* This function has been Mule-ized. */
   Charcount end;
@@ -3716,8 +3716,8 @@
     add_blank_rune (data, NULL, 0);
 
   end = Dynarr_length (db->runes) + 1;
-  if (max != -1)
-    end = min (max, end);
+  if (max_pos != -1)
+    end = min (max_pos, end);
 
   gb.glyph = glyph;
   gb.extent = Qnil;
@@ -5536,12 +5536,14 @@
   return 0;
 }
 
+#ifndef WINDOWSNT
 static Lisp_Object
 restore_profiling_redisplay_flag (Lisp_Object val)
 {
   profiling_redisplay_flag = XINT (val);
   return Qnil;
 }
+#endif
 
 /* Ensure that all windows on all frames on all devices are displaying
    the current contents of their respective buffers. */
@@ -5553,12 +5555,14 @@
   int size_change_failed = 0;
   int count = specpdl_depth ();
 
+#ifndef WINDOWSNT
   if (profiling_active)
     {
       record_unwind_protect (restore_profiling_redisplay_flag,
 			     make_int (profiling_redisplay_flag));
       profiling_redisplay_flag = 1;
     }
+#endif
 
   if (asynch_device_change_pending)
     handle_asynch_device_change ();