--- rxvt-unicode/src/defaultfont.h	2004/02/24 00:44:23	1.14
+++ rxvt-unicode/src/defaultfont.h	2004/03/05 04:43:41	1.16
@@ -36,18 +36,28 @@
 struct rxvt_drawable {
   rxvt_display *display;
   Drawable drawable;
-# if XFT
+#if XFT
   XftDraw *xftdrawable;
+  operator XftDraw *();
 #endif
+
   rxvt_drawable (rxvt_display *display, Drawable drawable)
-  : display(display), drawable(drawable), xftdrawable(0) { }
+  : display(display),
+#if XFT
+    xftdrawable(0),
+#endif
+    drawable(drawable)
+  { }
+
+#if XFT
   ~rxvt_drawable ();
+#endif
 
   operator Drawable() { return drawable; }
-  operator XftDraw *();
 };
 
 struct rxvt_font {
+  struct rxvt_fontset *fs;
   // managed by the fontset
   rxvt_t r;
   void set_term (rxvt_t r) { this->r = r; }