diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:20 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:20 +0000 |
| commit | 8636e5cc7ce7ce5ac913e6a59e2a8e1ea9065b1e (patch) | |
| tree | f276c3a252afb26db23814413a7a7f5d4d486296 /cxpm/cxpm.c | |
| parent | aafaabc4a0bfab6544e085ee504ad69de4a5ddb1 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
Diffstat (limited to 'cxpm/cxpm.c')
| -rw-r--r-- | cxpm/cxpm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cxpm/cxpm.c b/cxpm/cxpm.c index 20b4905..f7a7c5e 100644 --- a/cxpm/cxpm.c +++ b/cxpm/cxpm.c @@ -22,7 +22,7 @@ * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Arnaud LE HORS. */ -/* $XFree86: xc/extras/Xpm/cxpm/cxpm.c,v 1.2 2001/08/01 00:44:34 tsi Exp $ */ +/* $XFree86: xc/extras/Xpm/cxpm/cxpm.c,v 1.3 2003/05/27 16:45:41 tsi Exp $ */ /*****************************************************************************\ * cxpm.c: * @@ -47,8 +47,9 @@ * note that 's' could stand both for "special" and "slow" ;-) */ static int -sGetc(data) +sGetc(data, file) xpmData *data; + FILE *file; { int c = getc(data->stream.file); if (c == '\n') { @@ -61,9 +62,10 @@ sGetc(data) } static void -sUngetc(data, c) +sUngetc(data, c, file) xpmData *data; int c; + FILE *file; { ungetc(c, data->stream.file); if (c == '\n') { |