2 files changed, 5 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 14727d403c2..832c8abfdcc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2011-04-28  Paul Eggert  <eggert@cs.ucla.edu>
 
         * doprnt.c (doprnt): Omit useless test; int overflow check (Bug#8545).
+        (SIZE_MAX): Move defn after all includes, as they might #define it.
 
 2011-04-28  Juanma Barranquero  <lekktu@gmail.com>
 
diff --git a/src/doprnt.c b/src/doprnt.c
index eac1796c496..db0b66c3aa2 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -111,9 +111,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 
 #include <limits.h>
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
 
 #include "lisp.h"
 
@@ -122,6 +119,10 @@ 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