diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:31 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:31 +0000 |
| commit | e97c634593dd171a05aa0fa5a35d218dcc3ecfb0 (patch) | |
| tree | e0de50ad82b9890959a1a65d81a654935a1291bb /Xprint | |
| parent | 4b75c7f6358b28978b05ffa4b73853d936454f50 (diff) | |
merge XFree86 RC2 (4.3.99.902) from vendor branch
Diffstat (limited to 'Xprint')
| -rw-r--r-- | Xprint/attributes.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Xprint/attributes.c b/Xprint/attributes.c index ec60f3032..08d77a551 100644 --- a/Xprint/attributes.c +++ b/Xprint/attributes.c @@ -1,3 +1,4 @@ +/* $XdotOrg: attributes.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /* $Xorg: attributes.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company @@ -44,7 +45,7 @@ copyright holders. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.20 2003/10/29 22:11:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.21 2003/12/19 02:05:38 dawes Exp $ */ #include <X11/Xproto.h> #include <string.h> @@ -52,7 +53,7 @@ copyright holders. #include <sys/types.h> #include <sys/wait.h> #include <pwd.h> -#if defined(sun) && defined(SVR4) +#if (defined(sun) && defined(SVR4)) || (defined(SCO)) #include <wchar.h> #endif |