aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2010-09-21 14:13:36 +0300
committerDan Nicolaescu2010-09-21 14:13:36 +0300
commitd19e096ef54a8764186a72b1a0d6cf551ca8cc6e (patch)
treec4b0afb795305140de81b7c86dc3930ccf9d1c8c /src
parent92bc9a3678e0dbd7400067988ef0bd4410621f36 (diff)
downloademacs-d19e096ef54a8764186a72b1a0d6cf551ca8cc6e.tar.gz
emacs-d19e096ef54a8764186a72b1a0d6cf551ca8cc6e.zip
* src/emacs.c: Do not include sys/ioctl.h, not needed.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/emacs.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f44add45de0..205ae565e6b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12010-09-21 Dan Nicolaescu <dann@ics.uci.edu> 12010-09-21 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * emacs.c: Do not include sys/ioctl.h, not needed.
4
3 * doprnt.c: Do not include stdlib.h, config.h does it. 5 * doprnt.c: Do not include stdlib.h, config.h does it.
4 Move #include before macro definition. 6 Move #include before macro definition.
5 7
diff --git a/src/emacs.c b/src/emacs.c
index 33e0d60630b..5e7efb64226 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -32,10 +32,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
32#include <unistd.h> 32#include <unistd.h>
33#endif 33#endif
34 34
35#ifdef HAVE_SYS_IOCTL_H
36#include <sys/ioctl.h>
37#endif
38
39#ifdef WINDOWSNT 35#ifdef WINDOWSNT
40#include <fcntl.h> 36#include <fcntl.h>
41#include <windows.h> /* just for w32.h */ 37#include <windows.h> /* just for w32.h */