From bf11690ca24743008dc659a74d3ea7b13c3b29fe Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 9 Mar 2015 11:47:47 +0100 Subject: network: Avoid clash with FreeBSD --- cpukit/libnetworking/rtems/rtems_bsdnet_internal.h | 5 +---- cpukit/libnetworking/rtems/rtems_glue.c | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h index b790f0561d..fc0370ceb5 100644 --- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h +++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h @@ -61,10 +61,7 @@ void *memset(void *s, int c, size_t n); #define panic rtems_panic #define suser(a,b) 0 -static inline void microtime(struct timeval *tv) -{ - rtems_clock_get_uptime_timeval(tv); -} +void microtime(struct timeval *tv); #define hz rtems_bsdnet_ticks_per_second #define tick rtems_bsdnet_microseconds_per_tick diff --git a/cpukit/libnetworking/rtems/rtems_glue.c b/cpukit/libnetworking/rtems/rtems_glue.c index 7484cce9c3..f05530ee7a 100644 --- a/cpukit/libnetworking/rtems/rtems_glue.c +++ b/cpukit/libnetworking/rtems/rtems_glue.c @@ -1343,3 +1343,8 @@ m_clalloc(int ncl, int nowait) } return 1; } + +void microtime(struct timeval *tv) +{ + rtems_clock_get_uptime_timeval(tv); +} -- cgit v1.2.3