merge from gcc

1 files changed, 3 insertions, 8 deletions

diff --git a/libiberty/calloc.c b/libiberty/calloc.c
index 5073682..f4bd27b 100644
--- a/libiberty/calloc.c
+++ b/libiberty/calloc.c
@@ -13,19 +13,14 @@ Uses @code{malloc} to allocate storage for @var{nelem} objects of
 */
  
 #include "ansidecl.h"
-#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
-#else
-#define size_t unsigned long
-#endif
 
 /* For systems with larger pointers than ints, this must be declared.  */
-PTR malloc PARAMS ((size_t));
-void bzero PARAMS ((PTR, size_t));
+PTR malloc (size_t);
+void bzero (PTR, size_t);
 
 PTR
-calloc (nelem, elsize)
-  size_t nelem, elsize;
+calloc (size_t nelem, size_t elsize)
 {
   register PTR ptr;