From 7ed25ccf0d1e5b8c7fd3bd90f0375a06011cd394 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 12 May 2013 15:10:01 +0200 Subject: Revert "WIN32 MemoryTracking: track wcsdup() _wcsdup() and _tcsdup() usage" This reverts commit 8ec2cb5544b86306b702484ea785b6b9596562ab. We don't have any code anywhere in libcurl (or the curl tool) that use wcsdup so there's no such memory use to track. It seems to cause mild problems with the Borland compiler though that we may avoid by reverting this change again. Bug: http://curl.haxx.se/mail/lib-2013-05/0070.html --- lib/memdebug.h | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'lib/memdebug.h') diff --git a/lib/memdebug.h b/lib/memdebug.h index 955e8b72b..fbeb61de5 100644 --- a/lib/memdebug.h +++ b/lib/memdebug.h @@ -8,7 +8,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -46,11 +46,6 @@ CURL_EXTERN void *curl_dorealloc(void *ptr, size_t size, int line, const char *source); CURL_EXTERN void curl_dofree(void *ptr, int line, const char *source); CURL_EXTERN char *curl_dostrdup(const char *str, int line, const char *source); -#ifdef WIN32 -CURL_EXTERN wchar_t *curl_dowcsdup(const wchar_t *str, int line, - const char *source); -#endif - CURL_EXTERN void curl_memdebug(const char *logname); CURL_EXTERN void curl_memlimit(long limit); CURL_EXTERN void curl_memlog(const char *format, ...); @@ -89,19 +84,6 @@ CURL_EXTERN int curl_fclose(FILE *file, int line, const char *source); #define realloc(ptr,size) curl_dorealloc(ptr, size, __LINE__, __FILE__) #define free(ptr) curl_dofree(ptr, __LINE__, __FILE__) -#ifdef WIN32 -# undef wcsdup -# define wcsdup(ptr) curl_dowcsdup(ptr, __LINE__, __FILE__) -# undef _wcsdup -# define _wcsdup(ptr) curl_dowcsdup(ptr, __LINE__, __FILE__) -# undef _tcsdup -# ifdef UNICODE -# define _tcsdup(ptr) curl_dowcsdup(ptr, __LINE__, __FILE__) -# else -# define _tcsdup(ptr) curl_dostrdup(ptr, __LINE__, __FILE__) -# endif -#endif - #define socket(domain,type,protocol)\ curl_socket(domain,type,protocol,__LINE__,__FILE__) #undef accept /* for those with accept as a macro */ -- cgit v1.2.3