romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-03 00:20:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

memory: tidy up _tcsdup() override

Browse source 
Follow-up to ef2ccf862f #17840
Closes #17845
This commit is contained in:
Viktor Szakats 2025-07-07 15:11:53 +02:00
parent b5c531b09e
commit 172ca3bba9
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/curl_memory.h
View file

@ -68,11 +68,7 @@
#undef recv
#ifdef _WIN32
# ifdef UNICODE
# undef _tcsdup
# else
# undef _tcsdup
# endif
#undef _tcsdup
#endif
#undef socket
@ -152,14 +148,13 @@ extern curl_wcsdup_callback Curl_cwcsdup;
#define free(ptr) Curl_cfree(ptr)
#ifdef _WIN32
# ifdef UNICODE
# undef _tcsdup
# define _tcsdup(ptr) Curl_cwcsdup(ptr)
# else
# undef _tcsdup
# define _tcsdup(ptr) Curl_cstrdup(ptr)
# endif
#undef _tcsdup
#ifdef UNICODE
#define _tcsdup(ptr) Curl_cwcsdup(ptr)
#else
#define _tcsdup(ptr) Curl_cstrdup(ptr)
#endif
#endif /* _WIN32 */
#endif /* CURLDEBUG */
#endif /* HEADER_CURL_MEMORY_H */

13
lib/memdebug.h
View file

@ -141,14 +141,13 @@ CURL_EXTERN ALLOC_FUNC
#define recv(a,b,c,d) curl_dbg_recv(a,b,c,d, __LINE__, __FILE__)
#ifdef _WIN32
# ifdef UNICODE
# undef _tcsdup
# define _tcsdup(ptr) curl_dbg_wcsdup(ptr, __LINE__, __FILE__)
# else
# undef _tcsdup
# define _tcsdup(ptr) curl_dbg_strdup(ptr, __LINE__, __FILE__)
# endif
#undef _tcsdup
#ifdef UNICODE
#define _tcsdup(ptr) curl_dbg_wcsdup(ptr, __LINE__, __FILE__)
#else
#define _tcsdup(ptr) curl_dbg_strdup(ptr, __LINE__, __FILE__)
#endif
#endif /* _WIN32 */
#undef socket
#define socket(domain,type,protocol) \