* buffer.h (BUF_BYTES_MAX): Cast to ptrdiff_t so that it's signed.

diff --git a/src/ChangeLog b/src/ChangeLog
index 59fb2d89b24bf14dff02c18324d391adfd23958b..ed94ce5599c3cf4c4dad63c62ae665003414787d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * buffer.h (BUF_BYTES_MAX): Cast to ptrdiff_t so that it's signed.
+
 2011-06-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        Integer overflow and signedness fixes (Bug#8873).

diff --git a/src/buffer.h b/src/buffer.h
index dc1d62beb00e102e4a3a7c965b599430a128923a..a13351b5ea6574555f73af2b1b2ce2efe1cf8347 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -309,8 +309,10 @@ while (0)
 
 /* Maximum number of bytes in a buffer.
    A buffer cannot contain more bytes than a 1-origin fixnum can represent,
-   nor can it be so large that C pointer arithmetic stops working.  */
-#define BUF_BYTES_MAX min (MOST_POSITIVE_FIXNUM - 1, min (SIZE_MAX, PTRDIFF_MAX))
+   nor can it be so large that C pointer arithmetic stops working.
+   The ptrdiff_t cast ensures that this is signed, not unsigned.  */
+#define BUF_BYTES_MAX \
+  (ptrdiff_t) min (MOST_POSITIVE_FIXNUM - 1, min (SIZE_MAX, PTRDIFF_MAX))
 
 /* Return the address of byte position N in current buffer.  */