diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-14 12:40:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-14 12:40:23 -0400 |
| commit | 523b0ec288ae22d5d6cd448b37cfb5b0f7b71aca (patch) | |
| tree | 4f36b04bfdbc47caa0d047672c6b6416ccb6c930 /src/common | |
| parent | f2f720a7efe386cba06973a5927d2d4bc8bc9d60 (diff) | |
| parent | b1447a4312c47f13bf8ddddab09f19ee73640a3e (diff) | |
| download | tor-523b0ec288ae22d5d6cd448b37cfb5b0f7b71aca.tar tor-523b0ec288ae22d5d6cd448b37cfb5b0f7b71aca.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/util.c b/src/common/util.c index d4d7cb372..5329a0504 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2328,7 +2328,7 @@ read_file_to_str(const char *filename, int flags, struct stat *stat_out) } string[r] = '\0'; /* NUL-terminate the result. */ -#ifdef _WIN32 +#if defined(_WIN32) || defined(__CYGWIN__) if (!bin && strchr(string, '\r')) { log_debug(LD_FS, "We didn't convert CRLF to LF as well as we hoped " "when reading %s. Coping.", |