heiser@jupiter.zir.ethz.ch (11/16/89)
>From jupiter.zir.ethz.ch!heiser Wed Nov 15 20:42:55 MET 1989 remote from ethz
The files src/{emacs,filelock,doc}.c of emacs version 18.55 will not compile on
an Alliant. The reason is that the file <sys/parameter.h>, included by
<sys/file.h>, defines the macro NULL with a value of zero, breaking the NULL
macro defined in "lisp.h".
The remedy is to include <sys/file.h> before "lisp.h" as shown by the following
context diffs:
*** doc.c.orig Tue Mar 17 16:12:34 1987
--- doc.c Wed Nov 15 20:23:43 1989
***************
*** 19,30 ****
and this notice must be preserved on all copies. */
#include "config.h"
#include "lisp.h"
#include "buffer.h"
-
- #include <sys/types.h>
- #include <sys/file.h> /* Must be after sys/types.h for USG and BSD4_1*/
#ifdef USG5
#include <fcntl.h>
--- 19,30 ----
and this notice must be preserved on all copies. */
+ #include <sys/types.h>
+ #include <sys/file.h> /* Must be after sys/types.h for USG and BSD4_1*/
+
#include "config.h"
#include "lisp.h"
#include "buffer.h"
#ifdef USG5
#include <fcntl.h>
*** emacs.c.orig Mon Mar 13 22:41:29 1989
--- emacs.c Wed Nov 15 20:12:51 1989
***************
*** 24,35 ****
#include "config.h"
#include <stdio.h>
#undef NULL
#include "lisp.h"
#include "commands.h"
-
- #include <sys/types.h>
- #include <sys/file.h>
#ifdef VMS
#include <ssdef.h>
--- 24,35 ----
#include "config.h"
#include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/file.h>
+
#undef NULL
#include "lisp.h"
#include "commands.h"
#ifdef VMS
#include <ssdef.h>
*** filelock.c.orig Thu Mar 24 10:31:00 1988
--- filelock.c Wed Nov 15 20:19:37 1989
***************
*** 20,25 ****
--- 20,26 ----
#include <sys/types.h>
#include <sys/stat.h>
+ #include <sys/file.h>
#include "config.h"
#include "lisp.h"
#include "paths.h"
***************
*** 26,32 ****
#include "buffer.h"
#include <pwd.h>
#include <errno.h>
- #include <sys/file.h>
#ifdef USG
#include <fcntl.h>
#endif /* USG */
--- 27,32 ----
Gernot Heiser
Integrated Systems Laboratory Phone: +41 1/256 23 48
ETH Zuerich EUNET: heiser@iis.ethz.ch
CH-8092 Zuerich, Switzerland UUCP: {uunet,mcvax,cernvax...}!iis!heiser