From: Bruno Haible <bruno@clisp.org>
Date: Sat, 28 Aug 2010 21:20:01 +0000 (+0200)
Subject: Rename module 'malloc' -> 'malloc-gnu'.
X-Git-Tag: v0.1~3890
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=1c8b757146bcec4a92e2d109cf8b96bbecd7738d;p=gnulib.git

Rename module 'malloc' -> 'malloc-gnu'.
---

diff --git a/ChangeLog b/ChangeLog
index e4a89bc63..0c1e549f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-28  Bruno Haible  <bruno@clisp.org>
+
+	Rename module 'malloc' -> 'malloc-gnu'.
+	* modules/malloc-gnu: New file, copied from modules/malloc.
+	* modules/malloc: Convert to a redirection to 'malloc-gnu'. Mark as
+	obsolete.
+	* modules/argp (Depends-on): Update.
+	* modules/regex (Depends-on): Update.
+	* doc/posix-functions/malloc.texi: Update.
+	* NEWS: Mention the change.
+
 2010-08-28  Eric Blake  <eblake@redhat.com>
 
 	pread, pwrite: add missing dependency
diff --git a/NEWS b/NEWS
index 3f08cc49a..0134a12a3 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ User visible incompatible changes
 
 Date        Modules         Changes
 
+2010-08-28  malloc          This module is deprecated. Use 'malloc-gnu'
+                            instead. It will be removed 2012-01-01.
+
 2010-08-14  memxfrm         This module is renamed to amemxfrm. The include
                             file is renamed to "amemxfrm.h". The function is
                             renamed to amemxfrm.
diff --git a/doc/posix-functions/malloc.texi b/doc/posix-functions/malloc.texi
index 48721e1f3..ade421052 100644
--- a/doc/posix-functions/malloc.texi
+++ b/doc/posix-functions/malloc.texi
@@ -20,6 +20,6 @@ Portability problems not fixed by Gnulib:
 AIX 5.1, OSF/1 5.1.
 @end itemize
 
-Extension: Gnulib provides a module @samp{malloc} that substitutes a
+Extension: Gnulib provides a module @samp{malloc-gnu} that substitutes a
 @code{malloc} implementation that behaves more like the glibc implementation,
 regarding the result of @code{malloc (0)}.
diff --git a/modules/argp b/modules/argp
index bb1084432..fa39580ea 100644
--- a/modules/argp
+++ b/modules/argp
@@ -28,7 +28,7 @@ dirname-lgpl
 getopt-gnu
 strchrnul
 sysexits
-malloc
+malloc-gnu
 mempcpy
 strndup
 strcase
diff --git a/modules/malloc b/modules/malloc
index eb6ab6ac3..831f65965 100644
--- a/modules/malloc
+++ b/modules/malloc
@@ -6,15 +6,18 @@ This module should not be used as a dependency from a test module,
 otherwise when this module occurs as a tests-related module, it will
 have side effects on the compilation of the main modules in lib/.
 
+Status:
+obsolete
+
+Notice:
+This module is obsolete. Use the module 'malloc-gnu' instead.
+
 Files:
-lib/malloc.c
 
 Depends-on:
-malloc-posix
+malloc-gnu
 
 configure.ac:
-gl_FUNC_MALLOC_GNU
-AC_DEFINE([GNULIB_MALLOC_GNU], 1, [Define to indicate the 'malloc' module.])
 
 Makefile.am:
 
diff --git a/modules/malloc-gnu b/modules/malloc-gnu
new file mode 100644
index 000000000..eb6ab6ac3
--- /dev/null
+++ b/modules/malloc-gnu
@@ -0,0 +1,28 @@
+Description:
+malloc() function that is glibc compatible.
+
+Comment:
+This module should not be used as a dependency from a test module,
+otherwise when this module occurs as a tests-related module, it will
+have side effects on the compilation of the main modules in lib/.
+
+Files:
+lib/malloc.c
+
+Depends-on:
+malloc-posix
+
+configure.ac:
+gl_FUNC_MALLOC_GNU
+AC_DEFINE([GNULIB_MALLOC_GNU], 1, [Define to indicate the 'malloc' module.])
+
+Makefile.am:
+
+Include:
+<stdlib.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Jim Meyering
diff --git a/modules/regex b/modules/regex
index ecfd832ea..9492a0685 100644
--- a/modules/regex
+++ b/modules/regex
@@ -17,7 +17,7 @@ btowc
 extensions
 gettext-h
 localcharset
-malloc
+malloc-gnu
 memcmp
 memmove
 mbrtowc