# HG changeset patch
# User Vin Shelton <acs@xemacs.org>
# Date 1269299091 14400
# Node ID 8bf9e67e06ec6e14816420fc44c009bd6a433629
# Parent  57f4dcb14ad5b7c5fdb991a004a92d45177b6f05
Fix broken compile of window.c under Visual Studio 6.

diff -r 57f4dcb14ad5 -r 8bf9e67e06ec src/ChangeLog
--- a/src/ChangeLog	Sun Mar 21 13:25:21 2010 +0000
+++ b/src/ChangeLog	Mon Mar 22 19:04:51 2010 -0400
@@ -1,3 +1,8 @@
+2010-03-22  Vin Shelton  <acs@xemacs.org>
+
+	* window.c (vars_of_window): Move HAVE_SCROLLBARS test so the code
+	can compile under Visual Studio 6.
+
 2010-03-21  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* alloc.c (tick_lrecord_stats):
diff -r 57f4dcb14ad5 -r 8bf9e67e06ec src/window.c
--- a/src/window.c	Sun Mar 21 13:25:21 2010 +0000
+++ b/src/window.c	Mon Mar 22 19:04:51 2010 -0400
@@ -5516,14 +5516,20 @@
 vars_of_window (void)
 {
 #ifdef MEMORY_USAGE_STATS
+#ifdef HAVE_SCROLLBARS
   OBJECT_HAS_PROPERTY
     (window, memusage_stats_list,
      listu (Qface_cache, Qglyph_cache,
 	    Qline_start_cache, Qother_redisplay,
-#ifdef HAVE_SCROLLBARS
 	    Qscrollbar_instances,
+	    Qunbound));
+#else
+  OBJECT_HAS_PROPERTY
+    (window, memusage_stats_list,
+     listu (Qface_cache, Qglyph_cache,
+	    Qline_start_cache, Qother_redisplay,
+	    Qunbound));
 #endif
-	    Qunbound));
 #endif /* MEMORY_USAGE_STATS */
 
   DEFVAR_BOOL ("scroll-on-clipped-lines", &scroll_on_clipped_lines /*