diff options
| author | Dan Nicolaescu | 2010-11-14 22:27:41 -0800 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-11-14 22:27:41 -0800 |
| commit | f0e1af4627caf44e4f57147c8901991c79b65ea1 (patch) | |
| tree | a59aec062235015f3d3c8ca57eae9ce43f84e53c /src | |
| parent | c2f0866a23215457de561c2f10cebedb5c6aa38b (diff) | |
| download | emacs-f0e1af4627caf44e4f57147c8901991c79b65ea1.tar.gz emacs-f0e1af4627caf44e4f57147c8901991c79b65ea1.zip | |
* src/process.c: Include <sys/ioctl.h> unconditionally,
keyboard.c already does it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/process.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bef5242c9cb..912e9ae27cd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-11-15 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2010-11-15 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * process.c: Include <sys/ioctl.h> unconditionally, | ||
| 4 | keyboard.c already does it. | ||
| 5 | |||
| 3 | * keyboard.c (pending_malloc_warning): Add const to match | 6 | * keyboard.c (pending_malloc_warning): Add const to match |
| 4 | definition in alloc.c. | 7 | definition in alloc.c. |
| 5 | (Fset_input_interrupt_mode): Simplify #ifdefs. | 8 | (Fset_input_interrupt_mode): Simplify #ifdefs. |
diff --git a/src/process.c b/src/process.c index e1515065957..c38b94a9cb1 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -56,12 +56,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 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> |