commit 7ea6c4fcbedc5a8039ed91a4a5d77d7366109cd8 from: rsc date: Fri Jan 14 18:38:20 2005 UTC try to fix sun commit - 147e5e8702764582111967582c26190cd77b937e commit + 7ea6c4fcbedc5a8039ed91a4a5d77d7366109cd8 blob - 7b26766885a6e992d471074af0f8075a267369ac blob + f49f6f1fda8dab462211b09ee244f914687e1c9b --- src/cmd/postscript/common/common.h +++ src/cmd/postscript/common/common.h @@ -45,3 +45,4 @@ void *galloc(void *, int, char *); void pagelist(char *); int safe_tmpnam(char*); + blob - 86b98da50d7249dcd1618eac76d31635370799aa blob + 77635b6b5fc471685c4e2e336e8181b8cf65a97b --- src/cmd/postscript/common/ext.h +++ src/cmd/postscript/common/ext.h @@ -24,6 +24,8 @@ extern double pagewidth; extern int reading; /* input */ extern int writing; /* and output encoding */ +#define getopt ps_getopt +int getopt(int, char**, char*); extern char *optarg; /* for getopt() */ extern int optind; blob - 018885f7c123a155b92a7fbe9f26a134228be5cb blob + ae805befe669d10dc9fa1263a6fd249dbd26c97a --- src/cmd/postscript/common/getopt.c +++ src/cmd/postscript/common/getopt.c @@ -1,5 +1,6 @@ #include #include +#include "ext.h" #define ERR(str, chr) if(opterr){fprintf(stderr, "%s%s%c\n", argv[0], str, chr);} int opterr = 1; int optind = 1; blob - 1006b2559c9b80a50d5821c32275c31cff293426 blob + fa1d988242cca6f8030386e0c5807b97a42b6dde --- src/cmd/postscript/download/download.c +++ src/cmd/postscript/download/download.c @@ -63,6 +63,7 @@ #include #include +#include "../common/ext.h" #include "comments.h" /* PostScript file structuring comments */ #include "gen.h" /* general purpose definitions */ #include "path.h" /* for temporary directory */