aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2010-10-03 07:48:21 -0700
committerDan Nicolaescu2010-10-03 07:48:21 -0700
commit8271973583cc6fea0b3ae80198ffe459981be0e4 (patch)
tree57b59469c506be12235893da52b7eaf032f14337 /src
parent9de940b59e37677d7347532b98c63f92aa74ec0c (diff)
downloademacs-8271973583cc6fea0b3ae80198ffe459981be0e4.tar.gz
emacs-8271973583cc6fea0b3ae80198ffe459981be0e4.zip
* src/process.c: Do not include <sys/wait.h>, syswait.h does it.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/process.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ebec6b3ce82..9ea2adddc65 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12010-10-03 Dan Nicolaescu <dann@ics.uci.edu> 12010-10-03 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * process.c: Do not include <sys/wait.h>, syswait.h does it.
4
3 * sysdep.c (flush_pending_output): Remove code, does not do 5 * sysdep.c (flush_pending_output): Remove code, does not do
4 anything on any platform. 6 anything on any platform.
5 7
diff --git a/src/process.c b/src/process.c
index d149537878c..370fb673e84 100644
--- a/src/process.c
+++ b/src/process.c
@@ -67,10 +67,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
67#include <bsdtty.h> 67#include <bsdtty.h>
68#endif 68#endif
69 69
70#ifdef HAVE_SYS_WAIT
71#include <sys/wait.h>
72#endif
73
74#ifdef HAVE_RES_INIT 70#ifdef HAVE_RES_INIT
75#include <netinet/in.h> 71#include <netinet/in.h>
76#include <arpa/nameser.h> 72#include <arpa/nameser.h>