* lread.c, process.c: Do not include <inttypes.h>; lisp.h does it now.

diff --git a/src/ChangeLog b/src/ChangeLog
index 05f332b8142bf3cba0d79ae885b5f96c0bfce47a..a1e048b1390f73b5341620f42fe128ef2cf37f1c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-29  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * lread.c, process.c: Do not include <inttypes.h>; 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 2c8c3acd56a4667d79ed34250df460a7ee12eb4c..c7c91f8c3e4a3db0a901679a603d33930bdfcf5d 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -19,7 +19,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include <config.h>
-#include <inttypes.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/src/process.c b/src/process.c
index 1544522ff55fd3ac29d13568226b288c24eacd4b..59d1b9ea77fce5e51b5a5b6d8d079463a0d51075 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -28,9 +28,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <setjmp.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -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)