diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
commit | df49c60c9671e4a28e636964d744c1f59fb6cb68 (patch) | |
tree | eabd85e189514ad412a35414ba5d483dcda3ef1f /cpukit/libnetworking/lib | |
parent | Purged as many egcs references as possible. (diff) | |
download | rtems-df49c60c9671e4a28e636964d744c1f59fb6cb68.tar.bz2 |
Merged from 4.5.0-beta3a
Diffstat (limited to '')
-rw-r--r-- | cpukit/libnetworking/lib/Makefile.am | 4 | ||||
-rw-r--r-- | cpukit/libnetworking/lib/rtems_bsdnet_ntp.c | 6 | ||||
-rw-r--r-- | cpukit/libnetworking/libc/Makefile.am | 26 |
3 files changed, 18 insertions, 18 deletions
diff --git a/cpukit/libnetworking/lib/Makefile.am b/cpukit/libnetworking/lib/Makefile.am index 5f8d151e13..64e3a0e8f4 100644 --- a/cpukit/libnetworking/lib/Makefile.am +++ b/cpukit/libnetworking/lib/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/cpukit/libnetworking/lib/rtems_bsdnet_ntp.c b/cpukit/libnetworking/lib/rtems_bsdnet_ntp.c index 11b0cef63a..54974aa332 100644 --- a/cpukit/libnetworking/lib/rtems_bsdnet_ntp.c +++ b/cpukit/libnetworking/lib/rtems_bsdnet_ntp.c @@ -111,7 +111,7 @@ rtems_bsdnet_synchronize_ntp (int interval, rtems_task_priority priority) printf ("Can't set socket receive timeout: %s", strerror (errno)); return -1; } - memset (&myAddr, sizeof myAddr, 0); + memset (&myAddr, 0, sizeof myAddr); myAddr.sin_family = AF_INET; myAddr.sin_port = htons (123); myAddr.sin_addr.s_addr = htonl (INADDR_ANY); @@ -126,14 +126,14 @@ rtems_bsdnet_synchronize_ntp (int interval, rtems_task_priority priority) * server out there somewhere. */ if (rtems_bsdnet_ntpserver_count > 0) { - memset (&farAddr, sizeof farAddr, 0); + memset (&farAddr, 0, sizeof farAddr); farAddr.sin_family = AF_INET; farAddr.sin_port = htons (123); /* * For now, try only the first server. */ farAddr.sin_addr = rtems_bsdnet_ntpserver[0]; - memset (&packet, sizeof packet, 0); + memset (&packet, 0, sizeof packet); packet.li_vn_mode = (3 << 3) | 3; /* NTP version 3, client */ i = sendto (s, &packet, sizeof packet, 0, (struct sockaddr *)&farAddr, sizeof farAddr); if (i != sizeof packet) { diff --git a/cpukit/libnetworking/libc/Makefile.am b/cpukit/libnetworking/libc/Makefile.am index 57b2b412f2..aca9052ee2 100644 --- a/cpukit/libnetworking/libc/Makefile.am +++ b/cpukit/libnetworking/libc/Makefile.am @@ -1,20 +1,21 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 no-installman LIBNAME = lib.a LIB = $(ARCH)/$(LIBNAME) -C_FILES = base64.c gethostbydns.c gethostbyht.c gethostbynis.c \ - gethostnamadr.c getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c \ - getproto.c getprotoent.c getprotoname.c getservbyname.c getservbyport.c \ - getservent.c herror.c inet_addr.c inet_lnaof.c inet_makeaddr.c \ - inet_network.c inet_ntoa.c inet_ntop.c inet_pton.c map_v4v6.c \ - nsap_addr.c ns_name.c ns_netint.c ns_parse.c ns_print.c ns_ttl.c \ - res_comp.c res_data.c res_debug.c res_init.c res_mkquery.c \ - res_mkupdate.c res_query.c res_send.c res_stubs.c res_update.c strsep.c +C_FILES = addr2ascii.c ascii2addr.c base64.c gethostbydns.c gethostbyht.c \ + gethostbynis.c gethostnamadr.c getnetbydns.c getnetbyht.c getnetbynis.c \ + getnetnamadr.c getproto.c getprotoent.c getprotoname.c getservbyname.c \ + getservbyport.c getservent.c herror.c inet_addr.c inet_lnaof.c \ + inet_makeaddr.c inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c \ + inet_pton.c linkaddr.c map_v4v6.c nsap_addr.c ns_name.c ns_netint.c \ + ns_parse.c ns_print.c ns_ttl.c res_comp.c res_data.c res_debug.c \ + res_init.c res_mkquery.c res_mkupdate.c res_query.c res_send.c \ + res_stubs.c res_update.c strsep.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) @@ -30,8 +31,7 @@ man_MANS = addr2ascii.3 byteorder.3 ethers.3 gethostbyname.3 getnetent.3 \ # Add local stuff here using += # -AM_CPPFLAGS += -DNOPOLL -DNOSELECT -AM_CPPFLAGS += -U__STRICT_ANSI__ +AM_CPPFLAGS += -DNOPOLL -DNOSELECT -U__STRICT_ANSI__ $(LIB): $(OBJS) $(make-library) @@ -47,7 +47,7 @@ EXTRA_DIST = addr2ascii.3 addr2ascii.c ascii2addr.c base64.c byteorder.3 \ getprotoent.c getprotoname.c getservbyname.c getservbyport.c \ getservent.3 getservent.c herror.c inet.3 inet_addr.c inet_lnaof.c \ inet_makeaddr.c inet_net_ntop.c inet_net_pton.c inet_neta.c inet_netof.c \ - inet_network.c inet_ntoa.c inet_ntop.c inet_pton.c iso_addr.3 iso_addr.c \ + inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c inet_pton.c map_v4v6.c \ linkaddr.3 linkaddr.c map_v4v6.c ns.3 ns_addr.c ns_name.c ns_netint.c \ ns_ntoa.c ns_parse.c ns_print.c ns_ttl.c nsap_addr.c rcmd.3 rcmd.c \ recv.c res_comp.c res_config.h res_data.c res_debug.c res_init.c \ |