* alloc.c (string_overrun_cookie): Now const. Use initializers that

don't formally overflow signed char, to avoid warnings.

diff --git a/src/ChangeLog b/src/ChangeLog
index 51e379c12801b8156a83d33f090cb32210fb9cb0..d51052f0e3da7d159099ee6a58ad6dfa81ec0d0e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
        * alloc.c (BLOCK BYTES): Fix typo by changing "ablock" to "ablocks".
        This doesn't fix a bug but makes the code clearer.
+       (string_overrun_cookie): Now const.  Use initializers that
+       don't formally overflow signed char, to avoid warnings.
 
 2011-04-17  Chong Yidong  <cyd@stupidchicken.com>
 

diff --git a/src/alloc.c b/src/alloc.c
index 8e0cf5d43e1d8ac09622a76b21029b26d9ccc36d..2029383dec86257eee61efb8971e7ca4f7ee0ed9 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1628,8 +1628,8 @@ static EMACS_INT total_string_size;
    presence of this cookie during GC.  */
 
 #define GC_STRING_OVERRUN_COOKIE_SIZE  4
-static char string_overrun_cookie[GC_STRING_OVERRUN_COOKIE_SIZE] =
-  { 0xde, 0xad, 0xbe, 0xef };
+static char const string_overrun_cookie[GC_STRING_OVERRUN_COOKIE_SIZE] =
+  { '\xde', '\xad', '\xbe', '\xef' };
 
 #else
 #define GC_STRING_OVERRUN_COOKIE_SIZE 0