diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | awk.h | 1 | ||||
| -rw-r--r-- | io.c | 3 | ||||
| -rw-r--r-- | pc/ChangeLog | 4 | ||||
| -rw-r--r-- | pc/gawkmisc.pc | 4 | ||||
| -rw-r--r-- | posix/ChangeLog | 4 | ||||
| -rw-r--r-- | posix/gawkmisc.c | 2 | ||||
| -rw-r--r-- | vms/ChangeLog | 4 | ||||
| -rw-r--r-- | vms/gawkmisc.vms | 5 |
9 files changed, 27 insertions, 5 deletions
@@ -3,6 +3,11 @@ * eval.c (unwind_stack): If exiting, don't worry about strange stuff on the stack. + Unrelated: + + * awk.h (init_sockets): Declare. + * io.c (init_io): Remove ifdef around call. + 2013-06-01 Eli Zaretskii <eliz@gnu.org> * io.c (SHUT_RD) [SD_RECEIVE]: Define to SD_RECEIVE. @@ -1508,6 +1508,7 @@ extern int ispath(const char *file); extern int isdirpunct(int c); /* io.c */ +extern void init_sockets(void); extern void init_io(void); extern void register_input_parser(awk_input_parser_t *input_parser); extern void register_output_wrapper(awk_output_wrapper_t *wrapper); @@ -294,10 +294,9 @@ init_io() { long tmout; -#ifdef HAVE_SOCKETS /* Only MinGW has a non-trivial implementation of this. */ init_sockets(); -#endif + /* * N.B.: all these hacks are to minimize the effect * on programs that do not care about timeout. diff --git a/pc/ChangeLog b/pc/ChangeLog index f1d1978b..f6661368 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,7 @@ +2013-06-03 Arnold D. Robbins <arnold@skeeve.com> + + * gawkmisc.c (init_sockets): Rearrange ifdefs. + 2013-06-01 Eli Zaretskii <eliz@gnu.org> * popen.h (SIGKILL) [__MINGW32__]: Define. diff --git a/pc/gawkmisc.pc b/pc/gawkmisc.pc index ce45b6d8..c811f647 100644 --- a/pc/gawkmisc.pc +++ b/pc/gawkmisc.pc @@ -715,19 +715,21 @@ dlsym (void *handle, const char *name) } #endif /* DYNAMIC */ -#ifdef HAVE_SOCKETS void init_sockets(void) { +#ifdef HAVE_SOCKETS WSADATA winsockData; int errcode; if ((errcode = WSAStartup (0x101, &winsockData)) != 0 || winsockData.wVersion != 0x101) fatal(_("cannot start Winsock (%d)"), errcode); +#endif } +#ifdef HAVE_SOCKETS int socket_to_fd(SOCKET s) { diff --git a/posix/ChangeLog b/posix/ChangeLog index 443951c3..9eb72ff4 100644 --- a/posix/ChangeLog +++ b/posix/ChangeLog @@ -1,3 +1,7 @@ +2013-06-03 Arnold D. Robbins <arnold@skeeve.com> + + * gawkmisc.c (init_sockets): Remove ifdefs. + 2013-06-01 Eli Zaretskii <eliz@gnu.org> * gawkmisc.c (init_sockets): New dummy function. diff --git a/posix/gawkmisc.c b/posix/gawkmisc.c index c90123d2..d422bd0f 100644 --- a/posix/gawkmisc.c +++ b/posix/gawkmisc.c @@ -285,12 +285,10 @@ files_are_same(char *path, SRCFILE *src) && st.st_ino == src->sbuf.st_ino); } -#ifdef HAVE_SOCKETS void init_sockets(void) { } -#endif #ifdef __CYGWIN__ void diff --git a/vms/ChangeLog b/vms/ChangeLog index ca3bc436..048e2e61 100644 --- a/vms/ChangeLog +++ b/vms/ChangeLog @@ -1,3 +1,7 @@ +2013-06-03 Arnold D. Robbins <arnold@skeeve.com> + + * gawkmisc.c (init_sockets): New dummy function. + 2013-05-27 Arnold D. Robbins <arnold@skeeve.com> * vms-conf.h: Remove obsolete HAVE_ST_BLKSIZE. diff --git a/vms/gawkmisc.vms b/vms/gawkmisc.vms index 08c8fb5e..cbc59cd7 100644 --- a/vms/gawkmisc.vms +++ b/vms/gawkmisc.vms @@ -220,3 +220,8 @@ os_isatty(int fd) { return (isatty(fd) > 0); } + +void +init_sockets(void) +{ +} |