diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-07-30 21:07:26 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-07-30 21:07:26 +0000 |
| commit | 6e87009164f1af1bd1019f961837919c8e222114 (patch) | |
| tree | a8c9874f6bb134d64f40f6ad912612ee4b1832c6 | |
| parent | 62e84e786db6f95cb4be489648f9fbf41540d167 (diff) | |
Add prototypes of Xalloc/free functions.XORG-6_99_99_900XORG-6_8_99_901XORG-6_8_99_900
Export ImUtil.h to match modular tree install.
Define SVR4 to 1 to avoid warning about redefining to different values.
Include missing headers to clear more compiler warnings.
| -rw-r--r-- | src/delta/lbxdelta.c | 11 | ||||
| -rw-r--r-- | src/lbx_zlib/lbx_zlib.h | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/delta/lbxdelta.c b/src/delta/lbxdelta.c index 5085d33..78a1c74 100644 --- a/src/delta/lbxdelta.c +++ b/src/delta/lbxdelta.c @@ -44,6 +44,17 @@ extern struct ReqStats LbxRequestStats[LbxNumberReqs]; #define LBX_CODE 136 /* XXX - this should not be hardcoded - on todo list */ #endif +/* Copied from xc/programs/Xserver/include/xorg/os.h */ +#ifndef _HAVE_XALLOC_DECLS +#define _HAVE_XALLOC_DECLS +#include <X11/Xdefs.h> + +extern pointer Xalloc(unsigned long /*amount*/); +extern pointer Xcalloc(unsigned long /*amount*/); +extern pointer Xrealloc(pointer /*ptr*/, unsigned long /*amount*/); +extern void Xfree(pointer /*ptr*/); +#endif + /* * Allocate data structures needed for doing Delta compaction */ diff --git a/src/lbx_zlib/lbx_zlib.h b/src/lbx_zlib/lbx_zlib.h index 8c4f195..68b94f8 100644 --- a/src/lbx_zlib/lbx_zlib.h +++ b/src/lbx_zlib/lbx_zlib.h @@ -123,3 +123,14 @@ extern void FreeInput ( ZlibBufferPtr inbuf, int len ); extern void CommitOutBuf ( ZlibBufferPtr outbuf, int outlen ); extern int FlushOutBuf ( int fd, ZlibBufferPtr outbuf ); extern int FlushIovBuf ( int fd, struct iovec *iovbuf ); + +/* Copied from xc/programs/Xserver/include/xorg/os.h */ +#ifndef _HAVE_XALLOC_DECLS +#define _HAVE_XALLOC_DECLS +#include <X11/Xdefs.h> + +extern pointer Xalloc(unsigned long /*amount*/); +extern pointer Xcalloc(unsigned long /*amount*/); +extern pointer Xrealloc(pointer /*ptr*/, unsigned long /*amount*/); +extern void Xfree(pointer /*ptr*/); +#endif |