diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-02-09 18:03:10 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-02-09 18:03:10 +0000 |
| commit | 4624371d9a4c1a078bcb7a305adb0520cd8975bc (patch) | |
| tree | 3e976f55d9448bda9ab36215bd5673c0eab68d45 /src/process.c | |
| parent | 87e391bb24d57ce8c27226542ba11ea5f924689d (diff) | |
| download | emacs-4624371d9a4c1a078bcb7a305adb0520cd8975bc.tar.gz emacs-4624371d9a4c1a078bcb7a305adb0520cd8975bc.tar.bz2 emacs-4624371d9a4c1a078bcb7a305adb0520cd8975bc.zip | |
* configure.in (LIBX11_MACHINE, HAVE_XFREE386): Remove code
dealing with obsolete variables.
* fakemail.c (MAIL_PROGRAM_NAME): Remove unused conditional.
(main): Replace MAIL_PROGRAM_NAME with its value.
* src/Makefile.in:
* src/emacs.c:
* src/gmalloc.c:
* src/keyboard.c:
* src/lisp.h:
* src/m/ibm370aix.h:
* src/process.c:
* src/regex.c:
* src/s/hpux.h:
* src/sysdep.c:
* src/sysselect.h:
* src/systty.h:
* src/unexec.c:
* src/w32term.c:
* src/xsmfns.c:
* src/xterm.c: Remove code that deals with obsolete variables.
* s/msdos.h (DONT_NEED_ENVIRON): Don't define.
* ecrt0.c: Replace the DONT_NEED_ENVIRON test with MSDOS test,
nothing else needs it anymore.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/src/process.c b/src/process.c index 73da0db18a8..03b6a0b4f95 100644 --- a/src/process.c +++ b/src/process.c @@ -57,12 +57,9 @@ Boston, MA 02110-1301, USA. */ #include <netdb.h> #include <netinet/in.h> #include <arpa/inet.h> -#ifdef NEED_NET_ERRNO_H -#include <net/errno.h> -#endif /* NEED_NET_ERRNO_H */ /* Are local (unix) sockets supported? */ -#if defined (HAVE_SYS_UN_H) && !defined (NO_SOCKETS_IN_FILE_SYSTEM) +#if defined (HAVE_SYS_UN_H) #if !defined (AF_LOCAL) && defined (AF_UNIX) #define AF_LOCAL AF_UNIX #endif @@ -78,15 +75,6 @@ Boston, MA 02110-1301, USA. */ #include <client.h> #endif -/* On some systems, inet_addr returns a 'struct in_addr'. */ -#ifdef HAVE_BROKEN_INET_ADDR -#define IN_ADDR struct in_addr -#define NUMERIC_ADDR_ERROR (numeric_addr.s_addr == -1) -#else -#define IN_ADDR unsigned long -#define NUMERIC_ADDR_ERROR (numeric_addr == -1) -#endif - #if defined(BSD_SYSTEM) #include <sys/ioctl.h> #if !defined (O_NDELAY) && defined (HAVE_PTYS) && !defined(USG5) @@ -216,12 +204,6 @@ extern int h_errno; maybe other values to come. */ static Lisp_Object Vprocess_connection_type; -#ifdef SKTPAIR -#ifndef HAVE_SOCKETS -#include <sys/socket.h> -#endif -#endif /* SKTPAIR */ - /* These next two vars are non-static since sysdep.c uses them in the emulation of `select'. */ /* Number of events of change of status of a process. */ @@ -1905,14 +1887,6 @@ create_process (process, new_argv, current_dir) } else #endif /* HAVE_PTYS */ -#ifdef SKTPAIR - { - if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv) < 0) - report_file_error ("Opening socketpair", Qnil); - outchannel = inchannel = sv[0]; - forkout = forkin = sv[1]; - } -#else /* not SKTPAIR */ { int tem; tem = pipe (sv); @@ -1930,7 +1904,6 @@ create_process (process, new_argv, current_dir) outchannel = sv[1]; forkin = sv[0]; } -#endif /* not SKTPAIR */ #if 0 /* Replaced by close_process_descs */ @@ -3156,9 +3129,9 @@ usage: (make-network-process &rest ARGS) */) else /* Attempt to interpret host as numeric inet address */ { - IN_ADDR numeric_addr; + unsigned long numeric_addr; numeric_addr = inet_addr ((char *) SDATA (host)); - if (NUMERIC_ADDR_ERROR) + if (numeric_addr == -1) error ("Unknown host \"%s\"", SDATA (host)); bcopy ((char *)&numeric_addr, (char *) &address_in.sin_addr, |