summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2006-11-16 14:41:32 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2006-11-16 14:41:32 +0000
commitbd1c23685c41decff3d674a08d58820c51436cf7 (patch)
treec81acdf87a5250d22a015ab3e539c65f33c79ff3
parent2006-11-15 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-bd1c23685c41decff3d674a08d58820c51436cf7.tar.bz2
2006-11-16 Ralf Corsépius <ralf.corsepius@rtems.org>
* libnetworking/sys/malloc.h: Remove contigmalloc (non-implemented). Remove __P-guards from malloc, free.
-rw-r--r--cpukit/ChangeLog6
-rw-r--r--cpukit/libnetworking/sys/malloc.h7
2 files changed, 7 insertions, 6 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 8d6c728412..916597c1a3 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,7 +1,11 @@
+2006-11-16 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libnetworking/sys/malloc.h: Remove contigmalloc (non-implemented).
+ Remove __P-guards from malloc, free.
+
2006-11-15 Joel Sherrill <joel@OARcorp.com>
* sapi/src/io.c: Fix spacing.
-
* sapi/include/confdefs.h: Enable includes needed for new objects.
2006-11-15 Joel Sherrill <joel.sherrill@oarcorp.com>
diff --git a/cpukit/libnetworking/sys/malloc.h b/cpukit/libnetworking/sys/malloc.h
index 4574213ee8..97088147b8 100644
--- a/cpukit/libnetworking/sys/malloc.h
+++ b/cpukit/libnetworking/sys/malloc.h
@@ -345,11 +345,8 @@ extern struct kmemusage *kmemusage;
extern char *kmembase;
extern struct kmembuckets bucket[];
-void *contigmalloc __P((unsigned long size, int type, int flags,
- unsigned long low, unsigned long high,
- unsigned long alignment, unsigned long boundary));
-void free __P((void *addr, int type));
-void *malloc __P((unsigned long size, int type, int flags));
+void free (void *addr, int type);
+void *malloc (size_t size, int type, int flags);
#endif /* _KERNEL */
#endif /* !_SYS_MALLOC_H_ */