Attachment 21236 Details for Bug 19133 – fix dmx compile on 1.6 branch.

[patch] fix dmx compile on 1.6 branch.

x_dmx_gettocompile.diff (text/plain), 3.25 KB, created by Alban Browaeys on 2008-12-17 02:23:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alban Browaeys

Created: 2008-12-17 02:23:11 UTC

Size: 3.25 KB

patch

obsolete

>diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c
>index 4e7279a..ae6eb6f 100644
>--- a/hw/dmx/dmxcb.c
>+++ b/hw/dmx/dmxcb.c
>@@ -43,6 +43,12 @@
> #include "dmxinput.h"
> #include "dmxlog.h"
> 
>+#undef Xmalloc
>+#undef Xcalloc
>+#undef Xrealloc
>+#undef Xfree
>+
>+
> extern int     connBlockScreenStart;
> 
> #ifdef PANORAMIX
>diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c
>index d20c844..91479e7 100644
>--- a/hw/dmx/dmxextension.c
>+++ b/hw/dmx/dmxextension.c
>@@ -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;
>diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c
>index b70f7d2..c739159 100644
>--- a/hw/dmx/dmxfont.c
>+++ b/hw/dmx/dmxfont.c
>@@ -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;
> 
>diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c
>index 37dfa10..8bce689 100644
>--- a/hw/dmx/dmxpict.c
>+++ b/hw/dmx/dmxpict.c
>@@ -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);
>diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
>index 7360750..28c8b01 100644
>--- a/hw/dmx/dmxscrinit.c
>+++ b/hw/dmx/dmxscrinit.c
>@@ -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);
> 
>diff --git a/hw/dmx/glxProxy/glxutil.c b/hw/dmx/glxProxy/glxutil.c
>index 67ac822..063c015 100644
>--- a/hw/dmx/glxProxy/glxutil.c
>+++ b/hw/dmx/glxProxy/glxutil.c
>@@ -35,6 +35,12 @@
> #include <windowstr.h>
> #include "glxutil.h"
> 
>+#undef Xmalloc
>+#undef Xcalloc
>+#undef Xrealloc
>+#undef Xfree
>+
>+
> /************************************************************************/
> 
> void __glXNop(void) {}
>diff --git a/hw/dmx/glxProxy/glxvisuals.c b/hw/dmx/glxProxy/glxvisuals.c
>index b961dfa..c8b1eea 100644
>--- a/hw/dmx/glxProxy/glxvisuals.c
>+++ b/hw/dmx/glxProxy/glxvisuals.c
>@@ -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;
>diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c
>index a0eb80f..77f8ed5 100644
>--- a/hw/dmx/input/dmxinputinit.c
>+++ b/hw/dmx/input/dmxinputinit.c
>@@ -865,7 +865,7 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
>     
>     /* Print out information about the XInput Extension. */
>     handler = XSetExtensionErrorHandler(dmxInputExtensionErrorHandler);
>-    ext     = XQueryInputVersion(display, XI_2_Major, XI_2_Minor);
>+    ext     = XGetExtensionVersion(display, INAME);
>     XSetExtensionErrorHandler(handler);
>     
>     if (!ext || ext == (XExtensionVersion *)NoSuchExtension) {

Actions: View | Splinter Review

Attachments on bug 19133: 21236

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.