Mercurial > ecos
changeset 1288:c07ec2765e3e
Fix compile problems if GATEWAY support disabled
| author | gthomas |
|---|---|
| date | Mon, 06 Oct 2003 22:37:51 +0000 |
| parents | 48103792f09b |
| children | dbf0120b30ad |
| files | packages/redboot/current/ChangeLog packages/redboot/current/src/net/bootp.c packages/redboot/current/src/net/net_io.c |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/redboot/current/ChangeLog +++ b/packages/redboot/current/ChangeLog @@ -1,5 +1,8 @@ 2003-10-06 Gary Thomas <gary@mlbassoc.com> + * src/net/net_io.c: + * src/net/bootp.c: Fix some compile problems if GATEWAY support is disabled. + * src/flash.c (fis_list): Display FIS directory entries in FLASH address (sorted) order.
--- a/packages/redboot/current/src/net/bootp.c +++ b/packages/redboot/current/src/net/bootp.c @@ -280,10 +280,10 @@ int optlen = p[1]; p += 2; switch (tag) { +#ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY case TAG_SUBNET_MASK: // subnet mask memcpy(__local_ip_mask,p,4); break; -#ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY case TAG_GATEWAY: // router memcpy(__local_ip_gate,p,4); break;
--- a/packages/redboot/current/src/net/net_io.c +++ b/packages/redboot/current/src/net/net_io.c @@ -823,6 +823,7 @@ do_ip_addr(int argc, char *argv[]) return; } if (ip_addr_set) { +#ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY char *slash_pos; /* see if the (optional) mask length was given */ if( (slash_pos = strchr(ip_addr, '/')) ) { @@ -838,7 +839,7 @@ do_ip_addr(int argc, char *argv[]) mask = htonl((0xffffffff << (32-mask_len))&0xffffffff); memcpy(&__local_ip_mask, &mask, 4); } - +#endif if (!_gethostbyname(ip_addr, (in_addr_t *)&host)) { diag_printf("Invalid local IP address: %s\n", ip_addr); return;