--- epstool.cpp.orig Fri Jun 30 08:39:14 2000
+++ epstool.cpp Mon Jul 10 23:08:53 2000
@@ -25,7 +25,7 @@
char upname[MAXSTR];
char gsname[MAXSTR] = GSCOMMAND;
char bmpname[MAXSTR];
-char devname[MAXSTR];
+char gsdevname[MAXSTR];
char szScratch[] = "ep";
char szAppName[] = "epstool";
int resolution = 72;
@@ -132,9 +132,9 @@
find_gs(gsname, sizeof(gsname)-1, 550, FALSE);
#endif
#ifdef UNIX
- strcpy(devname, "pbmraw");
+ strcpy(gsdevname, "pbmraw");
#else
- strcpy(devname, "bmpmono");
+ strcpy(gsdevname, "bmpmono");
#endif
if (scan_args(argc, argv))
return 1;
@@ -375,10 +375,10 @@
fclose(tempfile);
#ifdef UNIX
sprintf(gscommand, "\042%s\042 -dNOPAUSE -dQUIET -sDEVICE=%s -sOutputFile=\042%s\042 -r%d -g%dx%d %s",
- gsname, devname, bmpname, resolution, width, height, tempname);
+ gsname, gsdevname, bmpname, resolution, width, height, tempname);
#else
sprintf(gscommand, "-dNOPAUSE\n-dQUIET\n-sDEVICE=%s\n-sOutputFile=\042%s\042\n-r%d\n-g%dx%d\n\042%s\042",
- devname, bmpname, resolution, width, height, tempname);
+ gsdevname, bmpname, resolution, width, height, tempname);
if (!quiet) {
fputs(gscommand, stderr);
fputs("\n", stderr);
@@ -548,7 +548,7 @@
break;
case 'z':
if (argp[2])
- strcpy(devname, argp+2);
+ strcpy(gsdevname, argp+2);
break;
case 'c':
if (got_op) {
