--- ray/src/px/oki20c.c 1993/08/02 14:39:07 2.10 +++ ray/src/px/oki20c.c 2003/07/27 22:12:03 2.13 @@ -1,18 +1,14 @@ -/* Copyright (c) 1992 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: oki20c.c,v 2.13 2003/07/27 22:12:03 schorsch Exp $"; #endif - /* * oki20c.c - program to dump pixel file to OkiMate 20 color printer. */ #include -#ifdef MSDOS -#include -#endif +#include +#include "platform.h" #include "color.h" #include "resolu.h" @@ -41,12 +37,9 @@ int argc; char *argv[]; { int i, status = 0; -#ifdef MSDOS - extern int _fmode; - _fmode = O_BINARY; - setmode(fileno(stdin), O_BINARY); - setmode(fileno(stdout), O_BINARY); -#endif + SET_DEFAULT_BINARY(); + SET_FILE_BINARY(stdin); + SET_FILE_BINARY(stdout); if (argc > 1 && !strcmp(argv[1], "-p")) { dofilter++; argv++; argc--; @@ -132,7 +125,7 @@ int y; register long c; register int i, j; - if (bpos = y % 23) { + if ( (bpos = y % 23) ) { for (j = 0; j < 3; j++) for (i = 0; i < len; i++)