* eval.c, doprnt.c (SIZE_MAX): Remove; inttypes.h defines this now.

diff --git a/src/ChangeLog b/src/ChangeLog
index dc8f983c870ad3431c54ab3537c6984014aab7e6..275d7e08a76fc9fb125c0127f01c74a96eeafb80 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,11 +1,13 @@
 2011-06-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * eval.c, doprnt.c (SIZE_MAX): Remove; inttypes.h defines this now.
+
        Variadic C functions now count arguments with ptrdiff_t.
        This partly undoes my 2011-03-30 change, which replaced int with size_t.
        Back then I didn't know that the Emacs coding style prefers signed int.
        Also, in the meantime I found a few more instances where arguments
-       were being counted with int, which may be too narrow, or EMACS_INT, which
-       may be too wide.
+       were being counted with int, which may truncate counts on 64-bit
+       machines, or EMACS_INT, which may be unnecessarily wide.
        * lisp.h (struct Lisp_Subr.function.aMANY)
        (DEFUN_ARGS_MANY, internal_condition_case_n, safe_call):
        Arg counts are now ptrdiff_t, not size_t.

diff --git a/src/doprnt.c b/src/doprnt.c
index f5e311536280ded9edebf868004769b5d257b769..195598c07eaa77ff779ef60533c85df3a3c35992 100644 (file)
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -118,10 +118,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    another macro.  */
 #include "character.h"
 
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
-
 #ifndef DBL_MAX_10_EXP
 #define DBL_MAX_10_EXP 308 /* IEEE double */
 #endif

diff --git a/src/eval.c b/src/eval.c
index 65cd87cd8ed053ec711d5cd1efec6e0ccf349936..eff50a4de520dea4bae3205dcc45dd8e767ec35c 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -32,10 +32,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "xterm.h"
 #endif
 
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
-
 /* This definition is duplicated in alloc.c and keyboard.c.  */
 /* Putting it in lisp.h makes cc bomb out!  */