From 2646fc254e75c4a7fc10d03d1139d0bd708ceae9 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 26 Jun 2016 01:51:18 +0200
Subject: nx-X11/programs/Xserver: Drop {X,x}alloc() macros, use malloc()
 instead.

---
 nx-X11/config/cf/X11.tmpl     |  9 ---------
 nx-X11/config/cf/host.def     |  6 ------
 nx-X11/config/cf/lnxLib.rules | 11 -----------
 nx-X11/config/cf/xorg.cf      |  4 ----
 nx-X11/config/cf/xorgsite.def | 19 -------------------
 5 files changed, 49 deletions(-)

(limited to 'nx-X11/config/cf')

diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index a6c410512..2b43ca562 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -336,15 +336,6 @@ XORGRELSTRING = XorgManVersionString
 #ifndef UseMemLeak
 #define UseMemLeak		NO
 #endif
-#ifndef SpecialMalloc
-#define SpecialMalloc		NO
-#endif
-#ifndef UseInternalMalloc
-#define UseInternalMalloc	NO
-#endif
-#ifndef XallocDefines
-#define XallocDefines		/**/
-#endif
 #ifndef ServerErrorDefines
 #define ServerErrorDefines	/**/
 #endif
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 76f2f6e8b..bc25ca9ff 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -290,12 +290,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 #define GnuMallocLibrary	-L/usr/local/lib -lgmalloc
  */
 
-/*
- * To enable the internal Xserver malloc, uncomment this
- *
-#define UseInternalMalloc	YES
- */
-
 /*
  * Some Linux releases don't have a libtermcap.  In this case you may need
  * to uncomment the following
diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules
index f6f5f8d0b..b8a67e2b7 100644
--- a/nx-X11/config/cf/lnxLib.rules
+++ b/nx-X11/config/cf/lnxLib.rules
@@ -17,17 +17,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
 
 #if UseElfFormat
 
-# if (LinuxCLibMajorVersion >= 5 && LinuxCLibMinorVersion >= 4) || LinuxCLibMajorVersion >= 6
-#  ifndef SpecialMalloc
-#   define SpecialMalloc NO
-#  endif
-#if 0
-#  ifndef UseInternalMalloc
-#   define UseInternalMalloc NO
-#  endif
-#endif
-# endif
-
 # if LinuxCLibMajorVersion <= 5
 /*
  *	#define BaseShLibReqs	-lc
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 54ca00bc5..3a391b152 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -512,10 +512,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 # endif
 #endif
 
-#ifndef UseInternalMalloc
-# define UseInternalMalloc	NO
-#endif
-
 #ifndef HasDlsymBug
 # define HasDlsymBug		NO
 #endif
diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def
index 8a0c805c2..86b6abdbc 100644
--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -162,25 +162,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 #define LinuxClibMinorVersion	4
  */
 
-/*
- * If you want to use the GNU malloc library, uncomment this
- *
-#define UseGnuMalloc		YES
- */
-
-/*
- * Set this to whatever is required to access the GNU malloc library.
- * The default is '-lgmalloc' unless is specified in the OS's .cf file.
- *
-#define GnuMallocLibrary	-L/usr/local/lib -lgmalloc
- */
-
-/*
- * To enable the internal Xserver malloc, uncomment this
- *
-#define UseInternalMalloc	YES
- */
-
 /*
  * Some Linux releases don't have a libtermcap.  In this case you may need
  * to uncomment the following
-- 
cgit v1.2.3