From 6e87009164f1af1bd1019f961837919c8e222114 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 30 Jul 2005 21:07:26 +0000 Subject: Add prototypes of Xalloc/free functions. 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. --- src/delta/lbxdelta.c | 11 +++++++++++ src/lbx_zlib/lbx_zlib.h | 11 +++++++++++ 2 files changed, 22 insertions(+) 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 + +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 + +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 -- cgit v1.2.3