--- a/src/window.c	Thu Jan 28 04:02:14 2010 -0600
+++ b/src/window.c	Thu Jan 28 04:27:30 2010 -0600
@@ -318,10 +318,10 @@
   if (print_readably)
     printing_unreadable_lcrecord (obj, 0);
 
-  write_c_string (printcharfun, "#<window");
+  write_ascstring (printcharfun, "#<window");
   buf = XWINDOW_BUFFER (obj);
   if (EQ (buf, Qt))
-    write_c_string (printcharfun, " during creation");
+    write_ascstring (printcharfun, " during creation");
   else if (!NILP (buf))
     {
       
@@ -1048,7 +1048,7 @@
 }
 
 int
-window_scrollbar_width (struct window *w)
+window_scrollbar_width (struct window * USED_IF_SCROLLBARS (w))
 {
 #ifdef HAVE_SCROLLBARS
   if (!WINDOW_WIN_P (w)
@@ -1067,7 +1067,7 @@
 /* Horizontal scrollbars are only active on windows with truncation
    turned on. */
 int
-window_scrollbar_height (struct window *w)
+window_scrollbar_height (struct window * USED_IF_SCROLLBARS (w))
 {
 #ifdef HAVE_SCROLLBARS
   if (!WINDOW_WIN_P (w)
@@ -1274,7 +1274,8 @@
 }
 
 static int
-window_left_window_gutter_width (struct window *w, int modeline)
+window_left_window_gutter_width (struct window *w,
+				 int USED_IF_SCROLLBARS (modeline))
 {
   if (!NILP (w->hchild) || !NILP (w->vchild))
     return 0;
@@ -1294,7 +1295,8 @@
 }
 
 static int
-window_right_window_gutter_width (struct window *w, int modeline)
+window_right_window_gutter_width (struct window *w,
+				  int USED_IF_SCROLLBARS (modeline))
 {
   int gutter = 0;