Remove printmax_t etc.

printmax_t etc. were needed only for platforms that lacked
support for printing intmax_t.  These platforms are now so
obsolete that they are no longer practical porting targets.
* src/image.c (gs_load): Fix unlikely buffer overrun
discovered while making these changes.  It was introduced in
2011-07-17T00:34:43!eggert@cs.ucla.edu.
* src/lisp.h (printmax_t, uprintmax_t, pMd, pMu, pMx):
Remove.  All uses replaced by their standard counterparts
intmax_t, uintmax_t, PRIdMAX, PRIuMAX, PRIxMAX.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/image.c b/src/image.c
index 6ead12166b6..b4b6c1bac1c 100644
--- a/src/image.c
+++ b/src/image.c
@@ -9735,8 +9735,8 @@ gs_image_p (Lisp_Object object)
 static bool
 gs_load (struct frame *f, struct image *img)
 {
-  uprintmax_t printnum1, printnum2;
-  char buffer[sizeof " " + INT_STRLEN_BOUND (printmax_t)];
+  uintmax_t printnum1, printnum2;
+  char buffer[sizeof " " + 2 * INT_STRLEN_BOUND (intmax_t)];
   Lisp_Object window_and_pixmap_id = Qnil, loader, pt_height, pt_width;
   Lisp_Object frame;
   double in_width, in_height;
@@ -9788,12 +9788,14 @@ gs_load (struct frame *f, struct image *img)
   printnum1 = FRAME_X_DRAWABLE (f);
   printnum2 = img->pixmap;
   window_and_pixmap_id
-    = make_formatted_string (buffer, "%"pMu" %"pMu, printnum1, printnum2);
+    = make_formatted_string (buffer, "%"PRIuMAX" %"PRIuMAX,
+                             printnum1, printnum2);
 
   printnum1 = FRAME_FOREGROUND_PIXEL (f);
   printnum2 = FRAME_BACKGROUND_PIXEL (f);
   pixel_colors
-    = make_formatted_string (buffer, "%"pMu" %"pMu, printnum1, printnum2);
+    = make_formatted_string (buffer, "%"PRIuMAX" %"PRIuMAX,
+                             printnum1, printnum2);
 
   XSETFRAME (frame, f);
   loader = image_spec_value (img->spec, QCloader, NULL);