summaryrefslogtreecommitdiffstats
path: root/miregion.c
diff options
context:
space:
mode:
Diffstat (limited to 'miregion.c')
-rw-r--r--miregion.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/miregion.c b/miregion.c
index 37f4927..7f4d041 100644
--- a/miregion.c
+++ b/miregion.c
@@ -50,10 +50,10 @@ SOFTWARE.
#include <stdio.h>
#include <stdlib.h>
-#include "miscstruct.h"
-#include "regionstr.h"
-#include "Xprotostr.h"
-#include "gc.h"
+#include "Xserver/miscstruct.h"
+#include "Xserver/regionstr.h"
+#include "X11/Xprotostr.h"
+#include "Xserver/gc.h"
#if defined (__GNUC__) && !defined (NO_INLINES)
#define INLINE __inline
@@ -61,6 +61,13 @@ SOFTWARE.
#define INLINE
#endif
+#undef xalloc
+#undef xrealloc
+#undef xfree
+#define xalloc malloc
+#define xrealloc realloc
+#define xfree free
+
/*
* hack until callers of these functions can deal with out-of-memory
*/