[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/sysdep.c,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/src/sysdep.c,v |
Date: |
Sat, 09 Feb 2008 18:03:14 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/02/09 18:03:11
Index: src/sysdep.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/sysdep.c,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -b -r1.294 -r1.295
--- src/sysdep.c 16 Jan 2008 16:28:58 -0000 1.294
+++ src/sysdep.c 9 Feb 2008 18:03:07 -0000 1.295
@@ -144,9 +144,7 @@
#if defined (USG)
#include <sys/utsname.h>
-#ifndef MEMORY_IN_STRING_H
#include <memory.h>
-#endif
#if defined (TIOCGWINSZ)
#ifdef NEED_SIOCTL
#include <sys/sioctl.h>
@@ -387,9 +385,6 @@
emacs_ospeed = 0;
else
{
-#ifdef INIT_BAUD_RATE
- INIT_BAUD_RATE ();
-#else
#ifdef DOS_NT
emacs_ospeed = 15;
#else /* not DOS_NT */
@@ -406,11 +401,6 @@
sg.c_cflag = B9600;
tcgetattr (fd, &sg);
emacs_ospeed = cfgetospeed (&sg);
-#if defined (USE_GETOBAUD) && defined (getobaud)
- /* m88k-motorola-sysv3 needs this (address@hidden) 9/1/94. */
- if (emacs_ospeed == 0)
- emacs_ospeed = getobaud (sg.c_cflag);
-#endif
#else /* neither VMS nor TERMIOS */
#ifdef HAVE_TERMIO
struct termio sg;
@@ -433,7 +423,6 @@
#endif /* not HAVE_TERMIOS */
#endif /* not VMS */
#endif /* not DOS_NT */
-#endif /* not INIT_BAUD_RATE */
}
baud_rate = (emacs_ospeed < sizeof baud_convert / sizeof baud_convert[0]
@@ -1274,11 +1263,9 @@
int lmode;
#endif
-#ifndef F_SETOWN_BUG
#ifdef F_SETOWN
int old_fcntl_owner[MAXDESC];
#endif /* F_SETOWN */
-#endif /* F_SETOWN_BUG */
/* This may also be defined in stdio,
but if so, this does no harm,
@@ -1632,7 +1619,6 @@
#endif /* VMS */
#ifdef F_SETFL
-#ifndef F_SETOWN_BUG
#ifdef F_GETOWN /* F_SETFL does not imply existence of F_GETOWN
*/
if (interrupt_input)
{
@@ -1651,7 +1637,6 @@
#endif /* HAVE_GPM */
}
#endif /* F_GETOWN */
-#endif /* F_SETOWN_BUG */
#endif /* F_SETFL */
#ifdef BSD4_1
@@ -1895,7 +1880,6 @@
#endif
#ifdef F_SETFL
-#ifndef F_SETOWN_BUG
#ifdef F_SETOWN /* F_SETFL does not imply existence of F_SETOWN
*/
if (interrupt_input)
{
@@ -1904,7 +1888,6 @@
old_fcntl_owner[fileno (tty_out->input)]);
}
#endif /* F_SETOWN */
-#endif /* F_SETOWN_BUG */
#ifdef O_NDELAY
fcntl (fileno (tty_out->input), F_SETFL,
fcntl (fileno (tty_out->input), F_GETFL, 0) & ~O_NDELAY);
@@ -2543,7 +2526,7 @@
#ifndef MSDOS
#ifndef VMS
-#if !defined (HAVE_SELECT) || defined (BROKEN_SELECT_NON_X)
+#if !defined (HAVE_SELECT)
#include "sysselect.h"
#undef select
@@ -2781,7 +2764,7 @@
}
}
-#if !defined (HAVE_SELECT) || defined (BROKEN_SELECT_NON_X)
+#if !defined (HAVE_SELECT)
#define select sys_select
#endif
@@ -5287,31 +5270,6 @@
#endif /* AIXHFT */
-#ifdef USE_DL_STUBS
-
-/* These are included on Sunos 4.1 when we do not use shared libraries.
- X11 libraries may refer to these functions but (we hope) do not
- actually call them. */
-
-void *
-dlopen ()
-{
- return 0;
-}
-
-void *
-dlsym ()
-{
- return 0;
-}
-
-int
-dlclose ()
-{
- return -1;
-}
-
-#endif /* USE_DL_STUBS */
#ifndef BSTRING
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/sysdep.c,v,
Dan Nicolaescu <=