--- ray/src/common/rtio.h 2016/08/18 00:52:48 3.13 +++ ray/src/common/rtio.h 2018/04/10 23:38:40 3.16 @@ -1,4 +1,4 @@ -/* RCSid $Id: rtio.h,v 3.13 2016/08/18 00:52:48 greg Exp $ */ +/* RCSid $Id: rtio.h,v 3.16 2018/04/10 23:38:40 greg Exp $ */ /* * Radiance i/o and string routines */ @@ -13,9 +13,17 @@ #ifdef getc_unlocked /* avoid horrendous overhead of flockfile */ #undef getc +#undef getchar #undef putc +#undef putchar +#undef feof +#undef ferror #define getc getc_unlocked +#define getchar getchar_unlocked #define putc putc_unlocked +#define putchar putchar_unlocked +#define feof feof_unlocked +#define ferror ferror_unlocked #endif #ifdef __cplusplus @@ -24,6 +32,7 @@ extern "C" { /* defined in badarg.c */ extern int badarg(int ac, char **av, char *fl); /* defined in expandarg.c */ +extern int envexpchr, filexpchr; extern int expandarg(int *acp, char ***avp, int n); /* defined in fdate.c */ extern time_t fdate(char *fname);