Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xorg-server/patches/xorg-server-1.5.99.3-fix-dmx-build.patch

    Annotation of /trunk/xorg-server/patches/xorg-server-1.5.99.3-fix-dmx-build.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 735 - (hide annotations) (download)
    Fri Dec 26 02:49:06 2008 UTC (15 years, 5 months ago) by niro
    File size: 2692 byte(s) 
    fixed patch
    1 niro 734 diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c
    2     index 4e7279a..ae6eb6f 100644
    3     --- a/hw/dmx/dmxcb.c
    4     +++ b/hw/dmx/dmxcb.c
    5     @@ -43,6 +43,12 @@
    6     #include "dmxinput.h"
    7     #include "dmxlog.h"
    8    
    9     +#undef Xmalloc
    10     +#undef Xcalloc
    11     +#undef Xrealloc
    12     +#undef Xfree
    13     +
    14     +
    15     extern int connBlockScreenStart;
    16    
    17     #ifdef PANORAMIX
    18     diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c
    19     index d20c844..91479e7 100644
    20     --- a/hw/dmx/dmxextension.c
    21     +++ b/hw/dmx/dmxextension.c
    22     @@ -64,6 +64,12 @@
    23     #include <X11/extensions/dmxproto.h> /* For DMX_BAD_* */
    24     #include "cursorstr.h"
    25    
    26     +#undef Xmalloc
    27     +#undef Xcalloc
    28     +#undef Xrealloc
    29     +#undef Xfree
    30     +
    31     +
    32     /* The default font is declared in dix/globals.c, but is not included in
    33     * _any_ header files. */
    34     extern FontPtr defaultFont;
    35     diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c
    36     index b70f7d2..c739159 100644
    37     --- a/hw/dmx/dmxfont.c
    38     +++ b/hw/dmx/dmxfont.c
    39     @@ -49,6 +49,12 @@
    40     #include "dixfont.h"
    41     #include "dixstruct.h"
    42    
    43     +#undef Xmalloc
    44     +#undef Xcalloc
    45     +#undef Xrealloc
    46     +#undef Xfree
    47     +
    48     +
    49     static int (*dmxSaveProcVector[256])(ClientPtr);
    50     static int dmxFontLastError;
    51    
    52     diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c
    53     index 37dfa10..8bce689 100644
    54     --- a/hw/dmx/dmxpict.c
    55     +++ b/hw/dmx/dmxpict.c
    56     @@ -56,6 +56,12 @@
    57     #include "mipict.h"
    58     #include "fbpict.h"
    59    
    60     +#undef Xmalloc
    61     +#undef Xcalloc
    62     +#undef Xrealloc
    63     +#undef Xfree
    64     +
    65     +
    66    
    67     extern int RenderErrBase;
    68     extern int (*ProcRenderVector[RenderNumberRequests])(ClientPtr);
    69     diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
    70     index 7360750..28c8b01 100644
    71     --- a/hw/dmx/dmxscrinit.c
    72     +++ b/hw/dmx/dmxscrinit.c
    73     @@ -61,6 +61,12 @@
    74     #include "mipointer.h"
    75     #include "micmap.h"
    76    
    77     +#undef Xmalloc
    78     +#undef Xcalloc
    79     +#undef Xrealloc
    80     +#undef Xfree
    81     +
    82     +
    83     extern Bool dmxCloseScreen(int idx, ScreenPtr pScreen);
    84     static Bool dmxSaveScreen(ScreenPtr pScreen, int what);
    85    
    86     diff --git a/hw/dmx/glxProxy/glxutil.c b/hw/dmx/glxProxy/glxutil.c
    87     index 67ac822..063c015 100644
    88     --- a/hw/dmx/glxProxy/glxutil.c
    89     +++ b/hw/dmx/glxProxy/glxutil.c
    90     @@ -35,6 +35,12 @@
    91     #include <windowstr.h>
    92     #include "glxutil.h"
    93    
    94     +#undef Xmalloc
    95     +#undef Xcalloc
    96     +#undef Xrealloc
    97     +#undef Xfree
    98     +
    99     +
    100     /************************************************************************/
    101    
    102     void __glXNop(void) {}
    103     diff --git a/hw/dmx/glxProxy/glxvisuals.c b/hw/dmx/glxProxy/glxvisuals.c
    104     index b961dfa..c8b1eea 100644
    105     --- a/hw/dmx/glxProxy/glxvisuals.c
    106     +++ b/hw/dmx/glxProxy/glxvisuals.c
    107     @@ -38,6 +38,12 @@
    108     #include "glxutil.h"
    109     #include "dmx_glxvisuals.h"
    110    
    111     +#undef Xmalloc
    112     +#undef Xcalloc
    113     +#undef Xrealloc
    114     +#undef Xfree
    115     +
    116     +
    117     static int numConfigs = 0;
    118     static __GLXvisualConfig *visualConfigs = NULL;
    119     static void **visualPrivates = NULL;