From 0a9345ed684bc74b27731fb2aeda2ebab13773c9 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 20 Mar 2015 10:44:42 -0500 Subject: shell/utils-cp.c: Avoid redefinition of TIMESPEC_TO_TIMEVAL --- cpukit/libmisc/shell/utils-cp.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cpukit/libmisc/shell/utils-cp.c b/cpukit/libmisc/shell/utils-cp.c index 7b7c7fc771..4eab78e262 100644 --- a/cpukit/libmisc/shell/utils-cp.c +++ b/cpukit/libmisc/shell/utils-cp.c @@ -328,6 +328,15 @@ copy_special(rtems_shell_cp_globals* cp_globals, struct stat *from_stat, int exi return (pflag ? setfile(cp_globals, from_stat, -1) : 0); } +#if defined(__rtems__) + /* + * Newlib's has the real BSD definition of this macro + * and it does not behave the same as this one. Thus we need to undefine + * the BSD standard one and use the one expected by this file. + */ + #undef TIMESPEC_TO_TIMEVAL +#endif + #define TIMESPEC_TO_TIMEVAL(tv, ts) { \ (tv)->tv_sec = *(ts); \ (tv)->tv_usec = 0; \ -- cgit v1.2.3