1 files changed, 10 insertions, 0 deletions

diff --git a/src/doprnt.c b/src/doprnt.c
index 1743c785f01..39562af19fa 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -126,6 +126,16 @@ doprnt (buffer, bufsize, format, format_end, nargs, args)
             case 'x':
               if (cnt == nargs)
                 error ("not enough arguments for format string");
+              if (sizeof (int) == sizeof (EMACS_INT))
+                ;
+              else if (sizeof (long) == sizeof (EMACS_INT))
+                /* Insert an `l' the right place.  */
+                string[1] = string[0],
+                string[0] = string[-1],
+                string[-1] = 'l',
+                string++;
+              else
+                abort ();
               sprintf (sprintf_buffer, fmtcpy, args[cnt++]);
               /* Now copy into final output, truncating as nec.  */
               string = sprintf_buffer;