[rtems commit] csb360/include/bsp.h: Rename delay() to rtems_bsp_delay() to avoid conflicts

Joel Sherrill joel at rtems.org
Fri Nov 10 20:41:01 UTC 2017


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

Author:    Joel Sherrill <joel at rtems.org>
Date:      Fri Nov 10 14:22:40 2017 -0600

csb360/include/bsp.h: Rename delay() to rtems_bsp_delay() to avoid conflicts

---

 c/src/lib/libbsp/m68k/csb360/include/bsp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h
index 92aa6de..5272e17 100644
--- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/csb360/include/bsp.h
@@ -138,7 +138,7 @@ extern int rtems_enet_driver_attach (struct rtems_bsdnet_ifconfig *config);
  *  This is very dependent on the clock speed of the target.
  */
 
-#define delay( microseconds ) \
+#define rtems_bsp_delay( microseconds ) \
   { register uint32_t _delay=(microseconds); \
     register uint32_t _tmp=123; \
     __asm__ volatile( "0: \



More information about the vc mailing list