diff options
| author | Joel Sherrill <joel@rtems.org> | 2017-11-10 14:22:40 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2017-11-10 14:40:46 -0600 |
| commit | 52841b58000d03cb005dcedb8c553ce271b8d9dc (patch) | |
| tree | 5cb72e049ec2a19bfe1b623e4a57acdf16407a6e | |
| parent | cpukit: Add a Version API. (diff) | |
| download | rtems-52841b58000d03cb005dcedb8c553ce271b8d9dc.tar.bz2 | |
csb360/include/bsp.h: Rename delay() to rtems_bsp_delay() to avoid conflicts
| -rw-r--r-- | c/src/lib/libbsp/m68k/csb360/include/bsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h index 92aa6dee9d..5272e17ae2 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: \ |