From edfd76ce9129a09cc5c338254127514fd0aea4be Mon Sep 17 00:00:00 2001
From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sun, 10 Oct 2010 08:49:31 -0700
Subject: Remove #ifdef emacs / #ifndef emacs code, unused.

* src/vm-limit.c:
* src/unexhp9k800.c:
* src/unexelf.c:
* src/unexaix.c:
* src/termcap.c: Remove #ifdef emacs / #ifndef emacs code, unused.
---
 src/unexelf.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'src/unexelf.c')

diff --git a/src/unexelf.c b/src/unexelf.c
index e4d26b310ff..605b9f75ac0 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -386,13 +386,8 @@ temacs:
 /* We do not use mmap because that fails with NFS.
    Instead we read the whole file, modify it, and write it out.  */
 
-#ifndef emacs
-#define fatal(a, b, c) fprintf (stderr, a, b, c), exit (1)
-#include <string.h>
-#else
 #include <config.h>
 extern void fatal (const char *msgid, ...);
-#endif
 
 #include <sys/types.h>
 #include <stdio.h>
@@ -403,7 +398,7 @@ extern void fatal (const char *msgid, ...);
 #include <fcntl.h>
 #if !defined (__NetBSD__) && !defined (__OpenBSD__)
 #include <elf.h>
-#endif
+#endif /* not __NetBSD__ and not __OpenBSD__ */
 #include <sys/mman.h>
 #if defined (_SYSTYPE_SYSV)
 #include <sys/elf_mips.h>
@@ -1287,13 +1282,8 @@ temacs:
   /* Write out new_file, and free the buffers.  */
 
   if (write (new_file, new_base, new_file_size) != new_file_size)
-#ifndef emacs
-    fatal ("Didn't write %d bytes: errno %d\n",
-	   new_file_size, errno);
-#else
     fatal ("Didn't write %d bytes to %s: errno %d\n",
 	   new_file_size, new_name, errno);
-#endif
   munmap (old_base, old_file_size);
   munmap (new_base, new_file_size);
 
-- 
cgit v1.2.1