aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-26 01:51:18 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-02 14:05:30 +0200
commit2646fc254e75c4a7fc10d03d1139d0bd708ceae9 (patch)
tree6a183ec2959f55cf8d6850d072b557399b401f7e /nx-X11/config/cf
parentacf87144d019f18e646501657d9082c6eba77f54 (diff)
downloadnx-libs-2646fc254e75c4a7fc10d03d1139d0bd708ceae9.tar.gz
nx-libs-2646fc254e75c4a7fc10d03d1139d0bd708ceae9.tar.bz2
nx-libs-2646fc254e75c4a7fc10d03d1139d0bd708ceae9.zip
nx-X11/programs/Xserver: Drop {X,x}alloc() macros, use malloc() instead.
Diffstat (limited to 'nx-X11/config/cf')
-rw-r--r--nx-X11/config/cf/X11.tmpl9
-rw-r--r--nx-X11/config/cf/host.def6
-rw-r--r--nx-X11/config/cf/lnxLib.rules11
-rw-r--r--nx-X11/config/cf/xorg.cf4
-rw-r--r--nx-X11/config/cf/xorgsite.def19
5 files changed, 0 insertions, 49 deletions
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
@@ -291,12 +291,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*/
/*
- * 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
@@ -163,25 +163,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*/
/*
- * 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
*