From 8727937b9656243b361ba3d8d12ff1ac502a9080 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 29 Apr 2011 00:55:25 -0700 Subject: [PATCH] * lread.c, process.c: Do not include ; lisp.h does it now. --- src/ChangeLog | 2 ++ src/lread.c | 1 - src/process.c | 5 +---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 05f332b8142..a1e048b1390 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-04-29 Paul Eggert + * lread.c, process.c: Do not include ; lisp.h does it now. + Prefer intptr_t/uintptr_t for integers the same widths as pointers. This removes an assumption that EMACS_INT and long are the same width as pointers. The assumption is true for Emacs porting targets diff --git a/src/lread.c b/src/lread.c index 2c8c3acd56a..c7c91f8c3e4 100644 --- a/src/lread.c +++ b/src/lread.c @@ -19,7 +19,6 @@ along with GNU Emacs. If not, see . */ #include -#include #include #include #include diff --git a/src/process.c b/src/process.c index 1544522ff55..59d1b9ea77f 100644 --- a/src/process.c +++ b/src/process.c @@ -28,9 +28,6 @@ along with GNU Emacs. If not, see . */ #include #include #include -#ifdef HAVE_INTTYPES_H -#include -#endif #include #include @@ -4539,7 +4536,7 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd, some data in the TCP buffers so that select works, but with custom pull/push functions we need to check if some data is available in the buffers manually. */ - if (nfds == 0 && + if (nfds == 0 && wait_proc && wait_proc->gnutls_p /* Check for valid process. */ /* Do we have pending data? */ && gnutls_record_check_pending (wait_proc->gnutls_state) > 0) -- 2.39.2