Mercurial > emacs

comparison src/process.c @ 111574:a92967e45167

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge trunk
author Kenichi Handa <handa@m17n.org>
date Wed, 17 Nov 2010 13:09:08 +0900
parents 32e6d2b445ce
children 6c24c5598611
comparison
equal deleted inserted replaced
111573:e89dd9c3633b 111574:a92967e45167
54 #define HAVE_LOCAL_SOCKETS 54 #define HAVE_LOCAL_SOCKETS
55 #include <sys/un.h> 55 #include <sys/un.h>
56 #endif 56 #endif
57 #endif 57 #endif
58 58
59 #if defined(HAVE_SYS_IOCTL_H)
60 #include <sys/ioctl.h> 59 #include <sys/ioctl.h>
61 #if defined(HAVE_NET_IF_H) 60 #if defined(HAVE_NET_IF_H)
62 #include <net/if.h> 61 #include <net/if.h>
63 #endif /* HAVE_NET_IF_H */ 62 #endif /* HAVE_NET_IF_H */
64 #endif /* HAVE_SYS_IOCTL_H */
65 63
66 #ifdef NEED_BSDTTY 64 #ifdef NEED_BSDTTY
67 #include <bsdtty.h> 65 #include <bsdtty.h>
68 #endif 66 #endif
69 67