https://sourceforge.net/tracker/?func=detail&aid=3408074&group_id=2435&atid=102435

	* Makefile.in (mingwrt_lib_LIBRARIES): Remove incorrect variable
	assignment.
	* src/libcrt/search/tdelete.c: Remove incorrect assertion about vkey.

diff --git a/ChangeLog b/ChangeLog
index 567bc7f..b9ebe3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-10-31  Earnie Boyd  <earnie@users.sourceforge.net>
 
+       https://sourceforge.net/tracker/?func=detail&aid=3408074&group_id=2435&atid=102435
+
+       * Makefile.in (mingwrt_lib_LIBRARIES): Remove incorrect variable
+       assignment.
+       * src/libcrt/search/tdelete.c: Remove incorrect assertion about vkey.
+
+2012-10-31  Earnie Boyd  <earnie@users.sourceforge.net>
+
        Correct DllMain() declarations and definitions.
 
        * src/libcrt/crt/dllcrt1.c: Correct DllMain declaration.

diff --git a/Makefile.in b/Makefile.in
index b0eb68b..56e8831 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -929,8 +929,6 @@ install-mingwrt-dirs: $(need-DESTDIR-compatibility)
        $(mkinstalldirs) $(DESTDIR)$(includedir)/sys
 
 mingwrt_bin_LIBRARIES := mingwm10.dll
-mingwrt_lib_LIBRARIES := $(wildcard libmsvcr*.a)
-mingwrt_lib_LIBRARIES += $(wildcard libmoldname*.a)
 mingwrt_lib_INCLUDES := \
   _mingw.h   dirent.h  glob.h      getopt.h    math.h    setjmp.h  strings.h \
   assert.h   dos.h     inttypes.h  mbctype.h   share.h   wchar.h   varargs.h \

diff --git a/src/libcrt/search/tdelete.c b/src/libcrt/search/tdelete.c
index 7f89209..d541276 100644 (file)
--- a/src/libcrt/search/tdelete.c
+++ b/src/libcrt/search/tdelete.c
@@ -40,7 +40,6 @@ tdelete(const void *vkey,     /* key to be deleted */
        node_t *p, *q, *r;
        int  cmp;
 
-       _DIAGASSERT(vkey != NULL);
        _DIAGASSERT(compar != NULL);
 
        if (rootp == NULL || (p = *rootp) == NULL)