diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:40 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:40 +0000 |
| commit | a4b29bd17ae57f76103d2aeb90659560741a67b9 (patch) | |
| tree | b8a8241378b752cbc7ef7041ac8100fedc7239c4 /src/error.c | |
| parent | ee452992357329f7af846eba8f5bbe61c5d27bfa (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/error.c')
| -rw-r--r-- | src/error.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/error.c b/src/error.c index 6caf66f..b9f527a 100644 --- a/src/error.c +++ b/src/error.c @@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ +/* $XFree86: xc/lib/ICE/error.c,v 1.6 2001/12/14 19:53:35 dawes Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" @@ -33,10 +34,6 @@ Author: Ralph Mor, X Consortium #include <errno.h> -#ifdef X_NOT_STDC_ENV -extern int errno; -#endif - void _IceErrorBadMinor (iceConn, majorOpcode, offendingMinor, severity) @@ -428,7 +425,7 @@ IcePointer values; fprintf (stderr, "ICE error: Offending minor opcode = %d (%s)\n", offendingMinorOpcode, str); - fprintf (stderr, " Offending sequence number = %d\n", + fprintf (stderr, " Offending sequence number = %lu\n", offendingSequence); switch (errorClass) @@ -609,8 +606,8 @@ IceConn iceConn; { fprintf (stderr, - "ICE default IO error handler doing an exit(), pid = %d, errno = %d\n", - getpid(), errno); + "ICE default IO error handler doing an exit(), pid = %ld, errno = %d\n", + (long)getpid(), errno); exit (1); } |