From f9e41928dd03382f262678acb3781ac68c671f83 Mon Sep 17 00:00:00 2001 From: Earnie Boyd Date: Wed, 31 Oct 2012 15:26:42 -0400 Subject: [PATCH 1/1] 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. --- ChangeLog | 8 ++++++++ Makefile.in | 2 -- src/libcrt/search/tdelete.c | 1 - 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 567bc7f..b9ebe3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2012-10-31 Earnie Boyd + 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 + 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 --- 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 --- 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) -- 2.11.0