Fix dmx compile on 1.6 branch.
http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg166742.html contains a patch from "arekm" which I build upon to make up this one. Mostly fixes for Xcalloc which I previously tried to fix the same way but without finding the right spot. I cannot tell if dmx works though. Only that it at least compile. Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
6be355b8e8
commit
cbd977cc15
|
@ -43,6 +43,12 @@
|
|||
#include "dmxinput.h"
|
||||
#include "dmxlog.h"
|
||||
|
||||
#undef Xmalloc
|
||||
#undef Xcalloc
|
||||
#undef Xrealloc
|
||||
#undef Xfree
|
||||
|
||||
|
||||
extern int connBlockScreenStart;
|
||||
|
||||
#ifdef PANORAMIX
|
||||
|
|
|
@ -64,6 +64,12 @@
|
|||
#include <X11/extensions/dmxproto.h> /* For DMX_BAD_* */
|
||||
#include "cursorstr.h"
|
||||
|
||||
#undef Xmalloc
|
||||
#undef Xcalloc
|
||||
#undef Xrealloc
|
||||
#undef Xfree
|
||||
|
||||
|
||||
/* The default font is declared in dix/globals.c, but is not included in
|
||||
* _any_ header files. */
|
||||
extern FontPtr defaultFont;
|
||||
|
|
|
@ -49,6 +49,12 @@
|
|||
#include "dixfont.h"
|
||||
#include "dixstruct.h"
|
||||
|
||||
#undef Xmalloc
|
||||
#undef Xcalloc
|
||||
#undef Xrealloc
|
||||
#undef Xfree
|
||||
|
||||
|
||||
static int (*dmxSaveProcVector[256])(ClientPtr);
|
||||
static int dmxFontLastError;
|
||||
|
||||
|
|
|
@ -56,6 +56,12 @@
|
|||
#include "mipict.h"
|
||||
#include "fbpict.h"
|
||||
|
||||
#undef Xmalloc
|
||||
#undef Xcalloc
|
||||
#undef Xrealloc
|
||||
#undef Xfree
|
||||
|
||||
|
||||
|
||||
extern int RenderErrBase;
|
||||
extern int (*ProcRenderVector[RenderNumberRequests])(ClientPtr);
|
||||
|
|
|
@ -61,6 +61,12 @@
|
|||
#include "mipointer.h"
|
||||
#include "micmap.h"
|
||||
|
||||
#undef Xmalloc
|
||||
#undef Xcalloc
|
||||
#undef Xrealloc
|
||||
#undef Xfree
|
||||
|
||||
|
||||
extern Bool dmxCloseScreen(int idx, ScreenPtr pScreen);
|
||||
static Bool dmxSaveScreen(ScreenPtr pScreen, int what);
|
||||
|
||||
|
|
|
@ -36,6 +36,12 @@
|
|||
#include <windowstr.h>
|
||||
#include "glxutil.h"
|
||||
|
||||
#undef Xmalloc
|
||||
#undef Xcalloc
|
||||
#undef Xrealloc
|
||||
#undef Xfree
|
||||
|
||||
|
||||
/************************************************************************/
|
||||
|
||||
void __glXNop(void) {}
|
||||
|
|
|
@ -38,6 +38,12 @@
|
|||
#include "glxutil.h"
|
||||
#include "dmx_glxvisuals.h"
|
||||
|
||||
#undef Xmalloc
|
||||
#undef Xcalloc
|
||||
#undef Xrealloc
|
||||
#undef Xfree
|
||||
|
||||
|
||||
static int numConfigs = 0;
|
||||
static __GLXvisualConfig *visualConfigs = NULL;
|
||||
static void **visualPrivates = NULL;
|
||||
|
|
Loading…
Reference in New Issue
Block a user