diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 4175298744..dada5a49f4 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,6 @@ 2006-11-16 Ralf Corsépius + * libnetworking/rtems/rtems_bsdnet_internal.h: Add timeout() define. * libnetworking/rtems/rtems_glue.c: Rename timeout() into rtems_bsdnet_timeout(). * libnetworking/sys/malloc.h: Remove contigmalloc (non-implemented). diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h index 41bd277ef9..bdf2cdbded 100644 --- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h +++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h @@ -127,11 +127,12 @@ struct rtems_bsdnet_ifconfig; /* * Redo kernel memory allocation */ -#define malloc rtems_bsdnet_malloc -#define free rtems_bsdnet_free +#define malloc(size,type,flags) rtems_bsdnet_malloc(size,type,flags) +#define free(ptr,type) rtems_bsdnet_free(ptr,type) +#define timeout(ftn,arg,ticks) rtems_bsdnet_timeout(ftp,arg,ticks) #define M_NOWAIT 0x0001 -void *rtems_bsdnet_malloc (unsigned long size, int type, int flags); +void *rtems_bsdnet_malloc (size_t size, int type, int flags); void rtems_bsdnet_free (void *addr, int type); void rtems_bsdnet_semaphore_obtain (void);