From: Rob Landley Date: Tue, 12 Sep 2006 22:42:03 +0000 (-0000) Subject: Revert duplicate patch. X-Git-Tag: 1_4_0~698 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=577905f1e45a9d9b65ef538408a7b8bb4fdb14fe;p=oweals%2Fbusybox.git Revert duplicate patch. I don't know why patch decided to apply this even though it was already in the tree. I thought the other hunks failed because they were totally unrelated leakage from Bernhard's tree (which they are; was the a reason for bundling them in with this fix? Do they have something to do with the GCC 2.95 fix? I suspect they prevent me from backporting this patch to 1.2.2 because the header consolidation into libbb.h hadn't been done yet, and no I'm not fixing it up: if that's the case then this patch won't be in 1.2.2 due to extraneous changes bundled with it that prevent a clean backport without rolling a new patch). --- diff --git a/include/platform.h b/include/platform.h index fa7749b39..fdaf50920 100644 --- a/include/platform.h +++ b/include/platform.h @@ -83,14 +83,6 @@ # endif #endif -/* gcc-2.95 had no va_copy but only __va_copy. */ -#if !__GNUC_PREREQ (3,0) -# include -# if !defined va_copy && defined __va_copy -# define va_copy(d,s) __va_copy((d),(s)) -# endif -#endif - /* ---- Endian Detection ------------------------------------ */ #if (defined __digital__ && defined __unix__)