Import Upstream version 5e4upstream/5e4

1 files changed, 8 insertions, 8 deletions

diff --git a/x.c b/x.c
index e062ba9..0c13a52 100644
--- a/x.c
+++ b/x.c
@@ -2317,7 +2317,7 @@ static int print_xwindow(exp, f, writing)
 {
   lputs(CLOSEDP(exp) ? "#<closed-X " : "#<X ", f);
   lputs((CAR(exp) & PXMP) ? "pixmap #x" : "window #x", f);
-  intprint((long) XWINDOW(exp), 16, f);
+  scm_intprint((long) XWINDOW(exp), 16, f);
   lputc('>', f);
   return 1;
 }
@@ -2327,7 +2327,7 @@ static int print_xcursor(exp, f, writing)
      int writing;
 {
   lputs("#<X cursor #x", f);
-  intprint((long) XCURSOR(exp), 16, f);
+  scm_intprint((long) XCURSOR(exp), 16, f);
   lputc('>', f);
   return 1;
 }
@@ -2347,7 +2347,7 @@ static int print_xcolormap(exp, f, writing)
      int writing;
 {
   lputs("#<X colormap ID #x", f);
-  intprint((long) XCOLORMAP(exp), 16, f);
+  scm_intprint((long) XCOLORMAP(exp), 16, f);
   lputc('>', f);
   return 1;
 }
@@ -2357,8 +2357,8 @@ static int print_xgcontext(exp, f, writing)
      int writing;
 {
   lputs("#<X graphics context, ID #x", f);
-  /*  intprint((long) GCONTEXT(exp)->gid, 16, f); skimu */
-  intprint((long) XGContextFromGC(XGCONTEXT(exp)), 16, f);
+  /*  scm_intprint((long) GCONTEXT(exp)->gid, 16, f); skimu */
+  scm_intprint((long) XGContextFromGC(XGCONTEXT(exp)), 16, f);
   lputc('>', f);
   return 1;
 }
@@ -2384,13 +2384,13 @@ static int print_xvisual(exp, f, writing)
 {
   XVisualInfo *xvi = XVISUALINFO(exp);
   lputs("#<X visual #x", f);
-  intprint((long) xvi->visualid, 16, f);
+  scm_intprint((long) xvi->visualid, 16, f);
   lputs(" ", f);
   lputs(xvisualclass2name(xvi->class), f);
   lputc(' ', f);
-  intprint((long) xvi->depth, 10, f);
+  scm_intprint((long) xvi->depth, 10, f);
   lputc('x', f);
-  intprint((long) xvi->colormap_size, 10, f);
+  scm_intprint((long) xvi->colormap_size, 10, f);
   lputc('>', f);
   return 1;
 }