[rtems commit] network: Avoid clash with FreeBSD <sys/time.h>
Sebastian Huber
sebh at rtems.org
Mon Mar 9 12:16:16 UTC 2015
Module: rtems
Branch: master
Commit: bf11690ca24743008dc659a74d3ea7b13c3b29fe
Changeset: http://git.rtems.org/rtems/commit/?id=bf11690ca24743008dc659a74d3ea7b13c3b29fe
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Mon Mar 9 11:47:47 2015 +0100
network: Avoid clash with FreeBSD <sys/time.h>
---
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 b790f05..fc0370c 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 7484cce..f05530e 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);
+}
More information about the vc
mailing list