diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-06-22 14:15:20 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-22 14:15:20 -0700 |
commit | df7fd961a9d9ba60840ffc0868d36cc3db2aec74 (patch) | |
tree | 3f5090d591b2308f553a9ee3764eb004c2dd0218 | |
parent | Ninth batch for 2.14 (diff) | |
parent | configure.ac: loosen FREAD_READS_DIRECTORIES test program (diff) | |
download | tgif-df7fd961a9d9ba60840ffc0868d36cc3db2aec74.tar.xz |
Merge branch 'nd/fopen-errors'
Hotfix for a topic that is already in 'master'.
* nd/fopen-errors:
configure.ac: loosen FREAD_READS_DIRECTORIES test program
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | configure.ac | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -19,7 +19,8 @@ all:: # have been written to the final string if enough space had been available. # # Define FREAD_READS_DIRECTORIES if you are on a system which succeeds -# when attempting to read from an fopen'ed directory. +# when attempting to read from an fopen'ed directory (or even to fopen +# it at all). # # Define NO_OPENSSL environment variable if you do not have OpenSSL. # This also implies BLK_SHA1. diff --git a/configure.ac b/configure.ac index 11d083fbe0..2f55237e65 100644 --- a/configure.ac +++ b/configure.ac @@ -922,9 +922,9 @@ AC_CACHE_CHECK([whether system succeeds to read fopen'ed directory], [ AC_RUN_IFELSE( [AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], - [[char c; + [[ FILE *f = fopen(".", "r"); - return f && fread(&c, 1, 1, f)]])], + return f)]])], [ac_cv_fread_reads_directories=no], [ac_cv_fread_reads_directories=yes]) ]) |