[rtems commit] shell: Include <rtems/shell.h> early

Sebastian Huber sebh at rtems.org
Thu Nov 20 13:53:25 UTC 2014


Module:    rtems
Branch:    master
Commit:    6b4a22e383b763bc290529c8831956df1984098b
Changeset: http://git.rtems.org/rtems/commit/?id=6b4a22e383b763bc290529c8831956df1984098b

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Nov 19 10:46:16 2014 +0100

shell: Include <rtems/shell.h> early

This avoids a conflict with the global variable defines.

---

 cpukit/libmisc/shell/main_ping.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cpukit/libmisc/shell/main_ping.c b/cpukit/libmisc/shell/main_ping.c
index f13f241..62b6cdd 100644
--- a/cpukit/libmisc/shell/main_ping.c
+++ b/cpukit/libmisc/shell/main_ping.c
@@ -100,6 +100,9 @@ __FBSDID("$FreeBSD$");
 #include "err.h"
 #include "sysexits.h"
 #include <sys/select.h>
+#ifdef __rtems__
+#include <rtems/shell.h>
+#endif /* __rtems__ */
 
 #define	INADDR_LEN	((int)sizeof(in_addr_t))
 #define	TIMEVAL_LEN	((int)sizeof(struct tv32))
@@ -1970,8 +1973,6 @@ g_usage(globals)
 }
 
 #if __rtems__
-  #include <rtems/shell.h>
-
   rtems_shell_cmd_t rtems_shell_PING_Command = {
     "ping",                        /* name */
     "ping [args]",                 /* usage */




More information about the vc mailing list