--- src/gdevgdi.c.orig	2003-07-07 00:18:31.000000000 +0200
+++ src/gdevgdi.c	2003-07-07 00:26:49.000000000 +0200
@@ -335,45 +335,45 @@
   unsigned char buffer[300];
   int dots_per_inch = (int)pdev->y_pixels_per_inch;
 
-  strcpy(buffer, "\x1b%-12345X");
+  strcpy(buffer, "\033%-12345X");
   
   /* Paper Type*/
-  strcat(buffer, "@PJL SET PAPERTYPE = NORMAL ON\x0d\x0a");
+  strcat(buffer, "@PJL SET PAPERTYPE = NORMAL ON\015\012");
   /*Density*/
-  strcat(buffer, "@PJL SET DENSITY = 1\x0d\x0a");
+  strcat(buffer, "@PJL SET DENSITY = 1\015\012");
   /* Toner Save*/
-  strcat(buffer, "@PJL SET TONERSAVE = OFF\x0d\x0a");
+  strcat(buffer, "@PJL SET TONERSAVE = OFF\015\012");
   /* Enter Language SMART*/
-  strcat(buffer, "@PJL ENTER LANGUAGE = SMART\x0d\x0a");
+  strcat(buffer, "@PJL ENTER LANGUAGE = SMART\015\012");
   /* JobStart*/
-  strcat(buffer, "$PJL JOB START\x0d\x0a");
+  strcat(buffer, "$PJL JOB START\015\012");
 
   /* Resolution*/
   if (dots_per_inch == 600)
-      strcat(buffer, "$PJL RESOLUTION = 600\x0d\x0a");
+      strcat(buffer, "$PJL RESOLUTION = 600\015\012");
   else
-      strcat(buffer, "$PJL RESOLUTION = 300\x0d\x0a");
+      strcat(buffer, "$PJL RESOLUTION = 300\015\012");
 
   /* Copies*/
-  strcat(buffer, "$PJL COPIES = 1\x0d\x0a");
+  strcat(buffer, "$PJL COPIES = 1\015\012");
   /* Paper Size*/
   switch (gdev_pcl_paper_size((gx_device*)pdev)) 
   {
 	case PAPER_SIZE_A4:
-  			strcat(buffer, "$PJL PAGE A4 AUTO\x0d\x0a");
+  			strcat(buffer, "$PJL PAGE A4 AUTO\015\012");
 			break;
 	case PAPER_SIZE_LETTER:
-  			strcat(buffer, "$PJL PAGE LETTER AUTO\x0d\x0a");
+  			strcat(buffer, "$PJL PAGE LETTER AUTO\015\012");
 			break;
 	case PAPER_SIZE_LEGAL:
-  			strcat(buffer, "$PJL PAGE LEGAL AUTO\x0d\x0a");
+  			strcat(buffer, "$PJL PAGE LEGAL AUTO\015\012");
 			break;
 	default:
-  			strcat(buffer, "$PJL PAGE LETTER AUTO\x0d\x0a");
+  			strcat(buffer, "$PJL PAGE LETTER AUTO\015\012");
 			break;
   }
   /* bitmap start*/
-  strcat(buffer, "$PJL BITMAP START\x0d\x0a");
+  strcat(buffer, "$PJL BITMAP START\015\012");
   /* write buffer to file.*/
   ulSize = strlen(buffer);
   fwrite(buffer, 1, ulSize, fp );
@@ -433,12 +433,12 @@
   unsigned long buffer[200];
 
   memset((char*)buffer, 0x00, 200);
-  strcpy((char*)buffer, "$PJL PRINT 4\x0d\x0a");
-  strcat((char*)buffer, "$PJL EOJ\x0d\x0a");
-  strcat((char*)buffer, "$PJL SYNC\x0d\x0a");
-  strcat((char*)buffer, "$PJL RELEASE 0 2047\x0d\x0a");
-  strcat((char*)buffer, "$PJL GARBAGE\x0d\x0a");
-  strcat((char*)buffer, "\x1b%-12345X\x0d\x0a");
+  strcpy((char*)buffer, "$PJL PRINT 4\015\012");
+  strcat((char*)buffer, "$PJL EOJ\015\012");
+  strcat((char*)buffer, "$PJL SYNC\015\012");
+  strcat((char*)buffer, "$PJL RELEASE 0 2047\015\012");
+  strcat((char*)buffer, "$PJL GARBAGE\015\012");
+  strcat((char*)buffer, "\033%-12345X\015\012");
 
   ulSize = strlen((char*)buffer);
   fwrite(buffer, 1, ulSize, fp);
@@ -881,16 +881,16 @@
   lDis  = ((long)usDy * lWarp) + (long)sDx;
 
   /* 1st, 2nd, 3rd & 4th byte*/
-  ultmp_dat = 0xc0000000;
+  ultmp_dat = 0xc0000000ul;
   if (lDis < 0)
   {
-    ultmp_dat |= 0x20000000;
+    ultmp_dat |= 0x20000000ul;
   }
-  ultmp_dat |= (lDis & 0x1fffffff);
-  *out_buf++ = (unsigned char)((ultmp_dat & 0xff000000) >> 24);
-  *out_buf++ = (unsigned char)((ultmp_dat & 0xff0000) >> 16);
-  *out_buf++ = (unsigned char)((ultmp_dat & 0xff00) >> 8);
-  *out_buf++ = (unsigned char)(ultmp_dat & 0xff);
+  ultmp_dat |= (lDis & 0x1ffffffful);
+  *out_buf++ = (unsigned char)((ultmp_dat & 0xff000000ul) >> 24);
+  *out_buf++ = (unsigned char)((ultmp_dat & 0xff0000ul) >> 16);
+  *out_buf++ = (unsigned char)((ultmp_dat & 0xff00ul) >> 8);
+  *out_buf++ = (unsigned char)(ultmp_dat & 0xfful);
 
   /* 5th & 6th byte*/
   ustmp_dat = 0xc000;

