From: Wouter Wijngaards Date: Tue, 5 Jul 2016 07:40:13 +0000 (+0000) Subject: - Fixes for 64bit windows compile. X-Git-Tag: release-1.5.10~57 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=941b31f90b00e80e2819afca89681511480fb201;p=thirdparty%2Funbound.git - Fixes for 64bit windows compile. git-svn-id: file:///svn/unbound/trunk@3808 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index 3edb17d1d..1b83c708a 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,7 @@ 5 July 2016: Wouter - Fix dynamic link of anchor-update.exe on windows. - Fix detect of mingw for MXE package build. + - Fixes for 64bit windows compile. 4 July 2016: Wouter - For #787: prefer-ip6 option for unbound.conf prefers to send diff --git a/smallapp/unbound-anchor.c b/smallapp/unbound-anchor.c index 81bb896f7..16009d845 100644 --- a/smallapp/unbound-anchor.c +++ b/smallapp/unbound-anchor.c @@ -1836,7 +1836,7 @@ write_unsigned_root(const char* root_anchor_file) #ifdef HAVE_FSYNC fsync(fileno(out)); #else - FlushFileBuffers((HANDLE)_fileno(out)); + FlushFileBuffers((HANDLE)get_osfhandle(_fileno(out))); #endif fclose(out); } @@ -1868,7 +1868,7 @@ write_root_anchor(const char* root_anchor_file, BIO* ds) #ifdef HAVE_FSYNC fsync(fileno(out)); #else - FlushFileBuffers((HANDLE)_fileno(out)); + FlushFileBuffers((HANDLE)get_osfhandle(_fileno(out))); #endif fclose(out); } diff --git a/util/winsock_event.c b/util/winsock_event.c index 40b79821a..9aad27edc 100644 --- a/util/winsock_event.c +++ b/util/winsock_event.c @@ -262,8 +262,9 @@ static int handle_select(struct event_base* base, struct timeval* wait) break; /* sanity check */ } log_assert(numwait <= WSA_MAXIMUM_WAIT_EVENTS); - verbose(VERB_CLIENT, "winsock_event bmax=%d numwait=%d wait=%x " - "timeout=%d", base->max, numwait, (int)wait, (int)timeout); + verbose(VERB_CLIENT, "winsock_event bmax=%d numwait=%d wait=%s " + "timeout=%d", base->max, numwait, (wait?"":""), + (int)timeout); /* do the wait */ if(numwait == 0) { diff --git a/validator/autotrust.c b/validator/autotrust.c index 232397c31..a5924f0ed 100644 --- a/validator/autotrust.c +++ b/validator/autotrust.c @@ -1201,7 +1201,7 @@ void autr_write_file(struct module_env* env, struct trust_anchor* tp) if(fsync(fileno(out)) != 0) log_err("could not fsync(%s): %s", fname, strerror(errno)); #else - FlushFileBuffers((HANDLE)_fileno(out)); + FlushFileBuffers((HANDLE)get_osfhandle(_fileno(out))); #endif if(fclose(out) != 0) { fatal_exit("could not complete write: %s: %s",