diff options
| author | Dan Nicolaescu | 2010-08-06 13:08:26 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-08-06 13:08:26 -0700 |
| commit | 32bc67090a4a4a25cc299644b94d726c4949c7d2 (patch) | |
| tree | b4728ced626b2e84091076d431873177b0a038fb /src/process.c | |
| parent | 385ee5fbbb1a0a0f49cd42769c27fcd07bd3e5c1 (diff) | |
| download | emacs-32bc67090a4a4a25cc299644b94d726c4949c7d2.tar.gz emacs-32bc67090a4a4a25cc299644b94d726c4949c7d2.zip | |
* src/process.c: Simplify include logic.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/process.c b/src/process.c index 56d914ce6d5..36f5a7d5adb 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -64,21 +64,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 64 | #if !defined (O_NDELAY) && defined (HAVE_PTYS) && !defined(USG5) | 64 | #if !defined (O_NDELAY) && defined (HAVE_PTYS) && !defined(USG5) |
| 65 | #include <fcntl.h> | 65 | #include <fcntl.h> |
| 66 | #endif /* HAVE_PTYS and no O_NDELAY */ | 66 | #endif /* HAVE_PTYS and no O_NDELAY */ |
| 67 | #if defined(HAVE_NET_IF_H) | ||
| 68 | #include <net/if.h> | ||
| 69 | #endif /* HAVE_NET_IF_H */ | ||
| 67 | #endif /* HAVE_SYS_IOCTL_H */ | 70 | #endif /* HAVE_SYS_IOCTL_H */ |
| 68 | 71 | ||
| 69 | #ifdef NEED_BSDTTY | 72 | #ifdef NEED_BSDTTY |
| 70 | #include <bsdtty.h> | 73 | #include <bsdtty.h> |
| 71 | #endif | 74 | #endif |
| 72 | 75 | ||
| 73 | /* Can we use SIOCGIFCONF and/or SIOCGIFADDR */ | ||
| 74 | #if defined(HAVE_SYS_IOCTL_H) && defined(HAVE_NET_IF_H) | ||
| 75 | /* sys/ioctl.h may have been included already */ | ||
| 76 | #ifndef SIOCGIFADDR | ||
| 77 | #include <sys/ioctl.h> | ||
| 78 | #endif | ||
| 79 | #include <net/if.h> | ||
| 80 | #endif | ||
| 81 | |||
| 82 | #ifdef HAVE_SYS_WAIT | 76 | #ifdef HAVE_SYS_WAIT |
| 83 | #include <sys/wait.h> | 77 | #include <sys/wait.h> |
| 84 | #endif | 78 | #endif |