upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-23 16:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fixes for 64bit windows compile.

Browse source 
git-svn-id: file:///svn/unbound/trunk@3808 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-07-05 07:40:13 +00:00
parent a758f2370a
commit 941b31f90b
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -1,6 +1,7 @@
5 July 2016: Wouter 5 July 2016: Wouter
- Fix dynamic link of anchor-update.exe on windows. - Fix dynamic link of anchor-update.exe on windows.
- Fix detect of mingw for MXE package build. - Fix detect of mingw for MXE package build.
- Fixes for 64bit windows compile.
4 July 2016: Wouter 4 July 2016: Wouter
- For #787: prefer-ip6 option for unbound.conf prefers to send - For #787: prefer-ip6 option for unbound.conf prefers to send

4
smallapp/unbound-anchor.c
View file

@ -1836,7 +1836,7 @@ write_unsigned_root(const char* root_anchor_file)
#ifdef HAVE_FSYNC #ifdef HAVE_FSYNC
fsync(fileno(out)); fsync(fileno(out));
#else #else
FlushFileBuffers((HANDLE)_fileno(out)); FlushFileBuffers((HANDLE)get_osfhandle(_fileno(out)));
#endif #endif
fclose(out); fclose(out);
} }
@ -1868,7 +1868,7 @@ write_root_anchor(const char* root_anchor_file, BIO* ds)
#ifdef HAVE_FSYNC #ifdef HAVE_FSYNC
fsync(fileno(out)); fsync(fileno(out));
#else #else
FlushFileBuffers((HANDLE)_fileno(out)); FlushFileBuffers((HANDLE)get_osfhandle(_fileno(out)));
#endif #endif
fclose(out); fclose(out);
} }

5
util/winsock_event.c
View file

@ -262,8 +262,9 @@ static int handle_select(struct event_base* base, struct timeval* wait)
break; /* sanity check */ break; /* sanity check */
} }
log_assert(numwait <= WSA_MAXIMUM_WAIT_EVENTS); log_assert(numwait <= WSA_MAXIMUM_WAIT_EVENTS);
verbose(VERB_CLIENT, "winsock_event bmax=%d numwait=%d wait=%x " verbose(VERB_CLIENT, "winsock_event bmax=%d numwait=%d wait=%s "
"timeout=%d", base->max, numwait, (int)wait, (int)timeout); "timeout=%d", base->max, numwait, (wait?"<wait>":"<null>"),
(int)timeout);
/* do the wait */ /* do the wait */
if(numwait == 0) { if(numwait == 0) {

2
validator/autotrust.c
View file

@ -1201,7 +1201,7 @@ void autr_write_file(struct module_env* env, struct trust_anchor* tp)
if(fsync(fileno(out)) != 0) if(fsync(fileno(out)) != 0)
log_err("could not fsync(%s): %s", fname, strerror(errno)); log_err("could not fsync(%s): %s", fname, strerror(errno));
#else #else
FlushFileBuffers((HANDLE)_fileno(out)); FlushFileBuffers((HANDLE)get_osfhandle(_fileno(out)));
#endif #endif
if(fclose(out) != 0) { if(fclose(out) != 0) {
fatal_exit("could not complete write: %s: %s", fatal_exit("could not complete write: %s: %s",