aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-29 00:55:25 -0700
committerPaul Eggert2011-04-29 00:55:25 -0700
commit8727937b9656243b361ba3d8d12ff1ac502a9080 (patch)
treee0c9ddbc3558e9b0939a3f61e0776b216c9509ff /src
parent8ac068ac0c00afa85bc4df54032b7a855c639312 (diff)
downloademacs-8727937b9656243b361ba3d8d12ff1ac502a9080.tar.gz
emacs-8727937b9656243b361ba3d8d12ff1ac502a9080.zip
* lread.c, process.c: Do not include <inttypes.h>; lisp.h does it now.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/lread.c1
-rw-r--r--src/process.c5
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 @@
12011-04-29 Paul Eggert <eggert@cs.ucla.edu> 12011-04-29 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * lread.c, process.c: Do not include <inttypes.h>; lisp.h does it now.
4
3 Prefer intptr_t/uintptr_t for integers the same widths as pointers. 5 Prefer intptr_t/uintptr_t for integers the same widths as pointers.
4 This removes an assumption that EMACS_INT and long are the same 6 This removes an assumption that EMACS_INT and long are the same
5 width as pointers. The assumption is true for Emacs porting targets 7 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 <http://www.gnu.org/licenses/>. */
19 19
20 20
21#include <config.h> 21#include <config.h>
22#include <inttypes.h>
23#include <stdio.h> 22#include <stdio.h>
24#include <sys/types.h> 23#include <sys/types.h>
25#include <sys/stat.h> 24#include <sys/stat.h>
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 <http://www.gnu.org/licenses/>. */
28#include <sys/file.h> 28#include <sys/file.h>
29#include <sys/stat.h> 29#include <sys/stat.h>
30#include <setjmp.h> 30#include <setjmp.h>
31#ifdef HAVE_INTTYPES_H
32#include <inttypes.h>
33#endif
34 31
35#include <unistd.h> 32#include <unistd.h>
36#include <fcntl.h> 33#include <fcntl.h>
@@ -4539,7 +4536,7 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
4539 some data in the TCP buffers so that select works, but 4536 some data in the TCP buffers so that select works, but
4540 with custom pull/push functions we need to check if some 4537 with custom pull/push functions we need to check if some
4541 data is available in the buffers manually. */ 4538 data is available in the buffers manually. */
4542 if (nfds == 0 && 4539 if (nfds == 0 &&
4543 wait_proc && wait_proc->gnutls_p /* Check for valid process. */ 4540 wait_proc && wait_proc->gnutls_p /* Check for valid process. */
4544 /* Do we have pending data? */ 4541 /* Do we have pending data? */
4545 && gnutls_record_check_pending (wait_proc->gnutls_state) > 0) 4542 && gnutls_record_check_pending (wait_proc->gnutls_state) > 0)