summaryrefslogtreecommitdiff
path: root/usr/src/head/malloc.h
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/head/malloc.h')
-rw-r--r--usr/src/head/malloc.h17
1 files changed, 3 insertions, 14 deletions
diff --git a/usr/src/head/malloc.h b/usr/src/head/malloc.h
index 8325420861..3c04bb2bf9 100644
--- a/usr/src/head/malloc.h
+++ b/usr/src/head/malloc.h
@@ -19,10 +19,12 @@
*
* CDDL HEADER END
*/
+/*
+ * Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ */
/* Copyright (c) 1988 AT&T */
/* All Rights Reserved */
-
#ifndef _MALLOC_H
#define _MALLOC_H
@@ -57,8 +59,6 @@ struct mallinfo {
unsigned long keepcost; /* cost of enabling keep option */
};
-#if defined(__STDC__)
-
#if (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX)) || \
defined(_XPG3)
#if __cplusplus >= 199711L
@@ -83,17 +83,6 @@ using std::calloc;
int mallopt(int, int);
struct mallinfo mallinfo(void);
-#else
-
-void *malloc();
-void free();
-void *realloc();
-void *calloc();
-int mallopt();
-struct mallinfo mallinfo();
-
-#endif /* __STDC__ */
-
#ifdef __cplusplus
}
#endif