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 | e3943e9c5eda00bce99d3a96cb68a1542c6c9a6e (patch) | |
| tree | 4c392e7ab39bf60c806241ef1e4a191e411059af /src/globals.h | |
| parent | abe0fd5d586b52a851a423a79b95070da418eb10 (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/globals.h')
| -rw-r--r-- | src/globals.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/globals.h b/src/globals.h index 6cd12e4..b3ef69f 100644 --- a/src/globals.h +++ b/src/globals.h @@ -25,6 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/SM/globals.h,v 1.5 2002/05/31 18:45:41 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium @@ -55,8 +56,13 @@ char *_SmAuthNames[] = {"MIT-MAGIC-COOKIE-1"}; IcePoAuthProc _SmcAuthProcs[] = {_IcePoMagicCookie1Proc}; IcePaAuthProc _SmsAuthProcs[] = {_IcePaMagicCookie1Proc}; +#ifndef __UNIXOS2__ SmsNewClientProc _SmsNewClientProc; -SmPointer _SmsNewClientData; +SmPointer _SmsNewClientData; +#else +SmsNewClientProc _SmsNewClientProc = 0; +SmPointer _SmsNewClientData = 0; +#endif SmcErrorHandler _SmcErrorHandler = _SmcDefaultErrorHandler; SmsErrorHandler _SmsErrorHandler = _SmsDefaultErrorHandler; |