diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:34:18 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:34:18 +0000 |
| commit | 0cf683dc257e0e6d2cd77d47010c6ce6fae99012 (patch) | |
| tree | 7b0123ac29a82d85019f3e1fa2b8984541d936a2 /src/sm_manager.c | |
| parent | 09ca1da2938f5086eddad61f589cd7d4a865f80f (diff) | |
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
Diffstat (limited to 'src/sm_manager.c')
| -rw-r--r-- | src/sm_manager.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/sm_manager.c b/src/sm_manager.c index 2f62b15..5c7cc55 100644 --- a/src/sm_manager.c +++ b/src/sm_manager.c @@ -34,6 +34,9 @@ in this Software without prior written authorization from The Open Group. #include "SMlibint.h" #include <X11/Xtrans.h> +#ifdef __USLC__ +#undef shutdown +#endif Status |