diff options
| author | Yang Tse <yangsita@gmail.com> | 2008-09-13 03:45:03 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2008-09-13 03:45:03 +0000 |
| commit | 89367d47a87e8bead28e229d6822718b987fac95 (patch) | |
| tree | 5dfe70ea54dea63addeeada7b4c42526a15f6053 | |
| parent | 7fdfd938e0646f01df8a2fc1e8830e7dc7451a84 (diff) | |
| download | curl-89367d47a87e8bead28e229d6822718b987fac95.tar.gz | |
Disable tracking of fdopen() calls in the low-level memory leak tracking
code when fdopen() is not available, to avoid compiler error.
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | lib/memdebug.c | 2 | ||||
| -rw-r--r-- | lib/memdebug.h | 4 |
3 files changed, 9 insertions, 1 deletions
@@ -6,6 +6,10 @@ Changelog +Yang Tse (13 Sep 2008) +- Disable tracking of fdopen() calls in the low-level memory leak tracking + code when fdopen() is not available, to avoid compiler error. + Yang Tse (12 Sep 2008) - Further adjust detection of strerror_r() in the configure process, and ensure that errno is not modified inside Curl_strerror(). diff --git a/lib/memdebug.c b/lib/memdebug.c index 413247e77..000e2469c 100644 --- a/lib/memdebug.c +++ b/lib/memdebug.c @@ -283,6 +283,7 @@ FILE *curl_fopen(const char *file, const char *mode, return res; } +#ifdef HAVE_FDOPEN FILE *curl_fdopen(int filedes, const char *mode, int line, const char *source) { @@ -292,6 +293,7 @@ FILE *curl_fdopen(int filedes, const char *mode, source, line, filedes, mode, res); return res; } +#endif int curl_fclose(FILE *file, int line, const char *source) { diff --git a/lib/memdebug.h b/lib/memdebug.h index 4e50ad1bb..8bfcc63b3 100644 --- a/lib/memdebug.h +++ b/lib/memdebug.h @@ -8,7 +8,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -67,8 +67,10 @@ CURL_EXTERN int curl_accept(int s, void *addr, void *addrlen, /* FILE functions */ CURL_EXTERN FILE *curl_fopen(const char *file, const char *mode, int line, const char *source); +#ifdef HAVE_FDOPEN CURL_EXTERN FILE *curl_fdopen(int filedes, const char *mode, int line, const char *source); +#endif CURL_EXTERN int curl_fclose(FILE *file, int line, const char *source); #ifndef MEMDEBUG_NODEFINES |