upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '137-remove-support-for-systems-without-ftello-fseeko' into 'master'

Browse source 
Resolve "Remove support for systems without ftello/fseeko"

Closes #137

See merge request isc-projects/bind9!113
This commit is contained in:
Ondřej Surý 2018-03-17 19:10:11 -04:00
commit 30b0b686ad
4 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config.h.in
View file

@ -248,12 +248,6 @@ int sigwait(const unsigned int *set, int *sig);
/* Define if OpenSSL provides FIPS_mode() */
#undef HAVE_FIPS_MODE
/* Define to 1 if you have the `fseeko' function. */
#undef HAVE_FSEEKO
/* Define to 1 if you have the `ftello' function. */
#undef HAVE_FTELLO
/* Build with GeoIP support */
#undef HAVE_GEOIP

14
configure vendored
View file

@ -13535,20 +13535,6 @@ fi
done
# BSDI doesn't have ftello fseeko
for ac_func in ftello fseeko
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
#
# UnixWare 7.1.1 with the feature supplement to the UDK compiler
# is reported to not support "static inline" (RT #1212).

3
configure.in
View file

@ -503,9 +503,6 @@ AC_CHECK_FUNCS(mmap)
AC_CHECK_FUNCS(seteuid setresuid)
AC_CHECK_FUNCS(setegid setresgid)
# BSDI doesn't have ftello fseeko
AC_CHECK_FUNCS(ftello fseeko)
#
# UnixWare 7.1.1 with the feature supplement to the UDK compiler
# is reported to not support "static inline" (RT #1212).

8
lib/isc/unix/stdio.c
View file

@ -48,11 +48,7 @@ isc_result_t
isc_stdio_seek(FILE *f, off_t offset, int whence) {
int r;
#ifdef HAVE_FSEEKO
r = fseeko(f, offset, whence);
#else
r = fseek(f, offset, whence);
#endif
if (r == 0)
return (ISC_R_SUCCESS);
else
@ -65,11 +61,7 @@ isc_stdio_tell(FILE *f, off_t *offsetp) {
REQUIRE(offsetp != NULL);
#ifdef HAVE_FTELLO
r = ftello(f);
#else
r = ftell(f);
#endif
if (r >= 0) {
*offsetp = r;
return (ISC_R_SUCCESS);