(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU

[gnu-emacs] / src / unexec.c

diff --git a/src/unexec.c b/src/unexec.c
index d14103f1dd5cfecc9a192e5008106fc190716341..e9be7aeac22eba09d1be957b4b4585a362ecc76d 100644 (file)
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -1,10 +1,10 @@
-/* Copyright (C) 1985, 1986, 1987, 1988, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -164,7 +164,7 @@ pointer looks like an int) but not on all machines.
 #define PERROR(arg) perror (arg); return -1
 #else
 #define IN_UNEXEC
-#include "config.h"
+#include <config.h>
 #define PERROR(file) report_error (file, new)
 #endif
 
@@ -210,11 +210,18 @@ static long data_scnptr;
 #ifdef HPUX
 extern void *sbrk ();
 #else
+#if 0
+/* Some systems with __STDC__ compilers still declare this `char *' in some
+   header file, and our declaration conflicts.  The return value is always
+   cast, so it should be harmless to leave it undefined.  Hopefully
+   machines with different size pointers and ints declare sbrk in a header
+   file.  */
 #ifdef __STDC__
 extern void *sbrk ();
 #else
 extern char *sbrk ();
 #endif /* __STDC__ */
+#endif
 #endif /* HPUX */
 
 #define SYMS_START ((long) N_SYMOFF (ohdr))
@@ -679,7 +686,7 @@ make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name)
        */
       ERROR0 ("can't build a COFF file from scratch yet");
 #else
-      bzero (hdr, sizeof hdr);
+      bzero (&hdr, sizeof hdr);
 #endif
     }