X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconsole-x.h;h=d664360c21256c95f2563014b7284c76e076c6d0;hb=fe69da567ca919e0d5757dd5fb1e5c8d7cb93408;hp=e9edc1078d97e41f5ad9c7e9aa4e5fd24aa58ab9;hpb=1d9bc86590766427e2431876a50d78206a99edd5;p=chise%2Fxemacs-chise.git

diff --git a/src/console-x.h b/src/console-x.h
index e9edc10..d664360 100644
--- a/src/console-x.h
+++ b/src/console-x.h
@@ -40,17 +40,6 @@ Boston, MA 02111-1307, USA.  */
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
-
-#if 0 /* mrb - Xos sux. */
-#ifdef USG
-#undef USG	/* ####KLUDGE for Solaris 2.2 and up */
-#include <X11/Xos.h>
-#define USG
-#else
-#include <X11/Xos.h>
-#endif
-#endif /* 0 */
-
 #include <X11/StringDefs.h>
 
 #ifdef HAVE_XPM
@@ -76,7 +65,7 @@ struct x_device
   /* Xt application info. */
   Widget Xt_app_shell;
 
-  /* Cache of GC's for frame's on this device. */
+  /* Cache of GC's for frames on this device. */
   struct gc_cache *gc_cache;
 
   /* Selected visual, depth and colormap for this device */
@@ -384,7 +373,7 @@ extern Lisp_Object Vdefault_x_device;
 /* Number of pixels below each line. */
 extern int x_interline_space; /* #### implement me */
 
-extern int x_selection_timeout;
+extern Fixnum x_selection_timeout;
 
 struct frame *x_any_window_to_frame (struct device *d, Window);
 struct frame *x_any_widget_or_parent_to_frame (struct device *d,