From xemacs-m  Wed Mar 19 12:50:13 1997
Received: from altair.xemacs.org (steve@xemacs.miranova.com [206.190.83.19])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id MAA27416
	for <xemacs-beta@xemacs.org>; Wed, 19 Mar 1997 12:50:12 -0600 (CST)
Received: (from steve@localhost)
	by altair.xemacs.org (8.8.5/8.8.5) id LAA09746;
	Wed, 19 Mar 1997 11:01:57 -0800
Mail-Copies-To: never
To: xemacs-beta@xemacs.org
Subject: inline.c patch (19.15)
X-Url: http://www.miranova.com/%7Esteve/
X-Face: #!T9!#9s-3o8)*uHlX{Ug[xW7E7Wr!*L46-OxqMu\xz23v|R9q}lH?cRS{rCNe^'[`^sr5"
 f8*@r4ipO6Jl!:Ccq<xoV[Qz2u8<8-+Vwf2gzJ44lf_/y9OaQ`@#Q65{U4/TC)i2`~/M&QI$X>p:9I
 OSS'2{-)-4wBnVeg0S\O4Al@)uC[pD|+
X-Attribution: sb
From: Steven L Baur <steve@miranova.com>
Mime-Version: 1.0 (generated by tm-edit 7.105)
Content-Type: text/plain; charset=US-ASCII
Date: 19 Mar 1997 11:01:56 -0800
Message-ID: <m2n2rzbt97.fsf@altair.xemacs.org>
Lines: 51
X-Mailer: Gnus v5.4.30/XEmacs 20.1(beta9)

The real fix is `/bin/rm -f src/inline.c' because GCC does not need
this file (any more).

Index: src/glyphs-x.h
===================================================================
RCS file: /usr/local/xemacs/xemacs-19.15/src/glyphs-x.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 glyphs-x.h
--- glyphs-x.h	1996/12/18 03:38:56	1.1.1.1
+++ glyphs-x.h	1997/03/19 18:48:44
@@ -72,6 +72,9 @@
 #define XIMAGE_INSTANCE_X_NPIXELS(i) \
   IMAGE_INSTANCE_X_NPIXELS (XIMAGE_INSTANCE (i))
 
+/* Set to 1 if you wish to implement this feature */
+# define HAVE_SUBWINDOWS 0
+# if HAVE_SUBWINDOWS
 /****************************************************************************
  *                            Subwindow Object                              *
  ****************************************************************************/
@@ -95,6 +98,7 @@
 
   int being_displayed;		/* used to detect when needs to be unmapped */
 };
+# endif
 
 #endif /* HAVE_X_WINDOWS */
 #endif /* _XEMACS_GLYPHS_X_H_ */


Index: src/glyphs-x.c
===================================================================
RCS file: /usr/local/xemacs/xemacs-19.15/src/glyphs-x.c,v
retrieving revision 1.8
diff -u -r1.8 glyphs-x.c
--- glyphs-x.c	1997/03/19 06:12:14	1.8
+++ glyphs-x.c	1997/03/19 18:48:57
@@ -59,9 +59,6 @@
 
 #include <setjmp.h>
 
-/* Set to 1 if you wish to implement this feature */
-# define HAVE_SUBWINDOWS 0
-
 #define LISP_DEVICE_TO_X_SCREEN(dev)					\
   XDefaultScreenOfDisplay (DEVICE_X_DISPLAY (XDEVICE (dev)))
 

-- 
steve@miranova.com baur
Unsolicited commercial e-mail will be billed at $250/message.

