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/SMlibint.h | |
| parent | abe0fd5d586b52a851a423a79b95070da418eb10 (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/SMlibint.h')
| -rw-r--r-- | src/SMlibint.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/SMlibint.h b/src/SMlibint.h index 030fc45..2e559de 100644 --- a/src/SMlibint.h +++ b/src/SMlibint.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/SMlibint.h,v 1.4 2001/12/14 19:53:55 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium @@ -40,14 +41,10 @@ in this Software without prior written authorization from The Open Group. #include <X11/ICE/ICEproto.h> #include <X11/SM/SMproto.h> -#ifndef X_NOT_STDC_ENV #include <stdlib.h> -#else -char *malloc(); -#endif #ifndef NULL -#define NULL 0 +#include <stddef.h> #endif |