[Emacs-diffs] /srv/bzr/emacs/trunk r110301: * frame.c (x_report_frame_params): Port better to wider ints.

[Paul Eggert]

------------------------------------------------------------
revno: 110301
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-30 18:43:28 -0700
message:
  * frame.c (x_report_frame_params): Port better to wider ints.
  
  Do not assume that EMACS_UINT is the same width as uprintmax_t,
  or that pointers can be printed in 15 decimal digits.
  Avoid GCC warnings if EMACS_UINT is wider than a pointer.
modified:
  src/ChangeLog
  src/frame.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-30 21:52:49 +0000
+++ b/src/ChangeLog     2012-10-01 01:43:28 +0000
@@ -1,3 +1,10 @@
+2012-10-01  Paul Eggert  <address@hidden>
+
+       * frame.c (x_report_frame_params): Port better to wider ints.
+       Do not assume that EMACS_UINT is the same width as uprintmax_t,
+       or that pointers can be printed in 15 decimal digits.
+       Avoid GCC warnings if EMACS_UINT is wider than a pointer.
+
 2012-09-30  Fabrice Popineau  <address@hidden>
 
        Support x64 build on MS-Windows.

=== modified file 'src/frame.c'
--- a/src/frame.c       2012-09-30 21:36:42 +0000
+++ b/src/frame.c       2012-10-01 01:43:28 +0000
@@ -3028,9 +3028,9 @@
 void
 x_report_frame_params (struct frame *f, Lisp_Object *alistptr)
 {
-  char buf[16];
   Lisp_Object tem;
-  EMACS_UINT w;
+  uprintmax_t w;
+  char buf[INT_BUFSIZE_BOUND (w)];
 
   /* Represent negative positions (off the top or left screen edge)
      in a way that Fmodify_frame_parameters will understand correctly.  */
@@ -3067,7 +3067,7 @@
      MS-Windows it returns a value whose type is HANDLE, which is
      actually a pointer.  Explicit casting avoids compiler
      warnings.  */
-  w = (EMACS_UINT) FRAME_X_WINDOW (f);
+  w = (uintptr_t) FRAME_X_WINDOW (f);
   store_in_alist (alistptr, Qwindow_id,
                  make_formatted_string (buf, "%"pMu, w));
 #ifdef HAVE_X_WINDOWS
@@ -3075,7 +3075,7 @@
   /* Tooltip frame may not have this widget.  */
   if (FRAME_X_OUTPUT (f)->widget)
 #endif
-    w = (EMACS_UINT) FRAME_OUTER_WINDOW (f);
+    w = (uintptr_t) FRAME_OUTER_WINDOW (f);
   store_in_alist (alistptr, Qouter_window_id,
                  make_formatted_string (buf, "%"pMu, w));
 #endif