From xemacs-m  Sat Mar 22 22:43:49 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 WAA02573
	for <xemacs-beta@xemacs.org>; Sat, 22 Mar 1997 22:43:48 -0600 (CST)
Received: (from steve@localhost)
	by altair.xemacs.org (8.8.5/8.8.5) id UAA11674;
	Sat, 22 Mar 1997 20:55:30 -0800
Mail-Copies-To: never
To: xemacs-beta@xemacs.org
Subject: Re: xemacs-20.1-b9 on linux: lib-src/emacsserver.c needs linux/socket.h
References: <199703230435.UAA18181@network-services.uoregon.edu>
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>
In-Reply-To: "David M. Meyer"'s message of Sat, 22 Mar 1997 20:35:48 -0800 (PST)
Mime-Version: 1.0 (generated by tm-edit 7.106)
Content-Type: text/plain; charset=US-ASCII
Date: 22 Mar 1997 20:55:29 -0800
Message-ID: <m2vi6jqkam.fsf@altair.xemacs.org>
Lines: 53
X-Mailer: Gnus v5.4.35/XEmacs 20.1(beta10)

David M Meyer writes:

> 	20.1-b9 has (at least) one small problem on linux:

You didn't specify a version, experimental Linux du jour 2.1 I presume 
since there's no problem on 2.0?

> 	lib-src/emacsserver.c needs linux/socket.h for the
> 	definition of sa_family_t (referenced in sys/un.h which
> 	just includes linux/un.h).

Somebody already posted a patch for this which I've tested on Linux
2.0.  Unless somebody else complains, it will become the official fix.

Index: lib-src/emacsserver.c
===================================================================
RCS file: /usr/local/xemacs/xemacs-20.0/lib-src/emacsserver.c,v
retrieving revision 1.2
diff -u -r1.2 emacsserver.c
--- emacsserver.c	1997/03/22 06:01:43	1.2
+++ emacsserver.c	1997/03/23 03:44:29
@@ -59,13 +59,6 @@
 #if ! defined (HAVE_SYSVIPC)
 /* BSD code is very different from SYSV IPC code */
 
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/signal.h>
-#include <sys/stat.h> /* Needed for chmod, at least on Linux */
-#include <sys/un.h>
-#include <stdio.h>
-#include <errno.h>
 #include "../src/sysproc.h" /* Needed for select */
 #ifndef SOCK_STREAM
 /* this is normally included by src/sysproc.h.  might be safe to omit
@@ -73,6 +66,13 @@
  * twice, so we can't include unconditionally.  */
 #include <sys/socket.h>
 #endif
+#include <sys/types.h>
+#include <sys/file.h>
+#include <sys/signal.h>
+#include <sys/stat.h> /* Needed for chmod, at least on Linux */
+#include <sys/un.h>
+#include <stdio.h>
+#include <errno.h>
 
 void
 main ()

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

