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 /include | |
| parent | ee452992357329f7af846eba8f5bbe61c5d27bfa (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'include')
| -rw-r--r-- | include/X11/ICE/ICElib.h | 1 | ||||
| -rw-r--r-- | include/X11/ICE/ICEmsg.h | 7 | ||||
| -rw-r--r-- | include/X11/ICE/ICEutil.h | 7 |
3 files changed, 15 insertions, 0 deletions
diff --git a/include/X11/ICE/ICElib.h b/include/X11/ICE/ICElib.h index 5385bf0..799899f 100644 --- a/include/X11/ICE/ICElib.h +++ b/include/X11/ICE/ICElib.h @@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ +/* $XFree86: xc/lib/ICE/ICElib.h,v 3.4 2001/12/14 19:53:35 dawes Exp $ */ #ifndef _ICELIB_H_ #define _ICELIB_H_ diff --git a/include/X11/ICE/ICEmsg.h b/include/X11/ICE/ICEmsg.h index 99976b5..94b1a00 100644 --- a/include/X11/ICE/ICEmsg.h +++ b/include/X11/ICE/ICEmsg.h @@ -26,12 +26,17 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ +/* $XFree86: xc/lib/ICE/ICEmsg.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */ #ifndef _ICEMSG_H_ #define _ICEMSG_H_ +#include <X11/Xfuncproto.h> + #include <X11/ICE/ICEconn.h> +_XFUNCPROTOBEGIN + /* * Function prototypes for internal ICElib functions */ @@ -299,4 +304,6 @@ extern void _IceErrorBadValue ( _IceRead (_iceConn, (unsigned long) (_bytes), _dummy); \ } +_XFUNCPROTOEND + #endif /* _ICEMSG_H_ */ diff --git a/include/X11/ICE/ICEutil.h b/include/X11/ICE/ICEutil.h index 0784a66..6b76b94 100644 --- a/include/X11/ICE/ICEutil.h +++ b/include/X11/ICE/ICEutil.h @@ -26,13 +26,18 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ +/* $XFree86: xc/lib/ICE/ICEutil.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */ #ifndef _ICEUTIL_H_ #define _ICEUTIL_H_ +#include <X11/Xfuncproto.h> + #include <stdio.h> #include <X11/Xlib.h> +_XFUNCPROTOBEGIN + /* * Data structure for entry in ICE authority file */ @@ -135,4 +140,6 @@ extern void IceSetPaAuthData ( #endif ); +_XFUNCPROTOEND + #endif /* _ICEUTIL_H_ */ |