[Emacs-diffs] /srv/bzr/emacs/trunk r101900: Remove #ifdef emacs / #ifndef emacs code, unused.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 101900
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-10 08:49:31 -0700
message:
  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.
modified:
  src/ChangeLog
  src/termcap.c
  src/unexaix.c
  src/unexelf.c
  src/unexhp9k800.c
  src/vm-limit.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-10 15:35:04 +0000
+++ b/src/ChangeLog     2010-10-10 15:49:31 +0000
@@ -1,5 +1,11 @@
 2010-10-10  Dan Nicolaescu  <address@hidden>
 
+       * vm-limit.c:
+       * unexhp9k800.c:
+       * unexelf.c:
+       * unexaix.c:
+       * termcap.c: Remove #ifdef emacs / #ifndef emacs code, unused.
+
        * Makefile.in (temacs): Use $(ALL_CFLAGS) on the link line.
        (PROFILING_LDFLAGS): Remove, not needed anymore.
 

=== modified file 'src/termcap.c'
--- a/src/termcap.c     2010-10-04 17:22:57 +0000
+++ b/src/termcap.c     2010-10-10 15:49:31 +0000
@@ -262,45 +262,20 @@
 
 /* Outputting a string with padding.  */
 
-#ifndef emacs
-short ospeed;
-/* If OSPEED is 0, we use this as the actual baud rate.  */
-int tputs_baud_rate;
-#endif
-
 char PC;
 
-#ifndef emacs
-/* Actual baud rate if positive;
-   - baud rate / 100 if negative.  */
-
-static const int speeds[] =
-  {
-    0, 50, 75, 110, 135, 150, -2, -3, -6, -12,
-    -18, -24, -48, -96, -192, -288, -384, -576, -1152
-  };
-
-#endif /* not emacs */
-
 void
 tputs (register char *str, int nlines, register int (*outfun) (/* ??? */))
 {
   register int padcount = 0;
   register int speed;
 
-#ifdef emacs
   extern EMACS_INT baud_rate;
   speed = baud_rate;
   /* For quite high speeds, convert to the smaller
      units to avoid overflow.  */
   if (speed > 10000)
     speed = - speed / 100;
-#else
-  if (ospeed == 0)
-    speed = tputs_baud_rate;
-  else
-    speed = speeds[ospeed];
-#endif
 
   if (!str)
     return;

=== modified file 'src/unexaix.c'
--- a/src/unexaix.c     2010-10-03 13:59:56 +0000
+++ b/src/unexaix.c     2010-10-10 15:49:31 +0000
@@ -40,13 +40,8 @@
  *
  */
 
-#ifndef emacs
-#define PERROR(arg) perror (arg); return -1
-#else
 #include <config.h>
 #define PERROR(file) report_error (file, new)
-#endif
-
 #include <a.out.h>
 /* Define getpagesize () if the system does not.
    Note that this may depend on symbols defined in a.out.h
@@ -92,7 +87,6 @@
 
 static int pagemask;
 
-#ifdef emacs
 #include <setjmp.h>
 #include "lisp.h"
 
@@ -103,7 +97,6 @@
     close (fd);
   report_file_error ("Cannot unexec", Fcons (build_string (file), Qnil));
 }
-#endif /* emacs */
 
 #define ERROR0(msg) report_error_1 (new, msg, 0, 0); return -1
 #define ERROR1(msg,x) report_error_1 (new, msg, x, 0); return -1
@@ -113,12 +106,7 @@
 report_error_1 (int fd, char *msg, int a1, int a2)
 {
   close (fd);
-#ifdef emacs
   error (msg, a1, a2);
-#else
-  fprintf (stderr, msg, a1, a2);
-  fprintf (stderr, "\n");
-#endif
 }
 
 static int make_hdr (int, int, unsigned, unsigned, unsigned, char *, char *);

=== modified file 'src/unexelf.c'
--- a/src/unexelf.c     2010-10-03 13:59:56 +0000
+++ b/src/unexelf.c     2010-10-10 15:49:31 +0000
@@ -386,13 +386,8 @@
 /* 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 @@
 #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 @@
   /* 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);
 

=== modified file 'src/unexhp9k800.c'
--- a/src/unexhp9k800.c 2010-10-03 13:59:56 +0000
+++ b/src/unexhp9k800.c 2010-10-10 15:49:31 +0000
@@ -49,16 +49,11 @@
   sigsetreturn (_sigreturn);
 */
 
-#ifdef emacs
 #include <config.h>
-#endif
-
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
-
 #include <a.out.h>
-
 #include <dl.h>
 
 /* brk value to restore, stored as a global.

=== modified file 'src/vm-limit.c'
--- a/src/vm-limit.c    2010-07-29 06:59:29 +0000
+++ b/src/vm-limit.c    2010-10-10 15:49:31 +0000
@@ -17,12 +17,9 @@
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifdef emacs
 #include <config.h>
 #include <setjmp.h>
 #include "lisp.h"
-#endif
-
 #include "mem-limits.h"
 
 /*