epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

rtems: Fix rtems_bsdnet_bootp_server_address decl with RTEMS_LEGACY_STACK

Browse Source 
The legacy stack provides this variable and this decl clashed. This was
seen before now due to the link order of libraries.
This commit is contained in:
Chris Johns
2023-04-12 14:36:19 -10:00
committed by Andrew Johnson
parent f9d1fbeedb
commit 9d65da5c61
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/libcom/RTEMS/posix/rtems_init.c
View File

@ -102,9 +102,9 @@ char bootp_server_name_init[128] = "1001.1001@10.0.5.1:/epics";
char bootp_boot_file_name_init[128] = "/epics/myExample/bin/RTEMS-beatnik/myExample.boot"; char bootp_boot_file_name_init[128] = "/epics/myExample/bin/RTEMS-beatnik/myExample.boot";
char bootp_cmdline_init[128] = "/epics/myExample/iocBoot/iocmyExample/st.cmd"; char bootp_cmdline_init[128] = "/epics/myExample/iocBoot/iocmyExample/st.cmd";
struct in_addr rtems_bsdnet_bootp_server_address;
/* TODO check rtems_bsdnet_bootp_cmdline */ /* TODO check rtems_bsdnet_bootp_cmdline */
#ifndef RTEMS_LEGACY_STACK #ifndef RTEMS_LEGACY_STACK
struct in_addr rtems_bsdnet_bootp_server_address;
char *rtems_bsdnet_bootp_server_name = bootp_server_name_init; char *rtems_bsdnet_bootp_server_name = bootp_server_name_init;
char *rtems_bsdnet_bootp_boot_file_name = bootp_boot_file_name_init; char *rtems_bsdnet_bootp_boot_file_name = bootp_boot_file_name_init;
char *rtems_bsdnet_bootp_cmdline = bootp_cmdline_init; char *rtems_bsdnet_bootp_cmdline = bootp_cmdline_init;