mirror of
https://github.com/curl/curl.git
synced 2026-08-07 01:28:49 +03:00
parent
8b7cbe9dec
commit
7c8bae0d9c
74 changed files with 117 additions and 3159 deletions
|
|
@ -69,7 +69,7 @@ LIBS = $(BLANK_AT_MAKETIME)
|
|||
if USE_EXPLICIT_LIB_DEPS
|
||||
curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@
|
||||
else
|
||||
curl_LDADD = $(top_builddir)/lib/libcurl.la @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
|
||||
curl_LDADD = $(top_builddir)/lib/libcurl.la @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
|
||||
endif
|
||||
|
||||
# if unit tests are enabled, build a static library to link them with
|
||||
|
|
|
|||
|
|
@ -37,11 +37,6 @@
|
|||
#include <fcntl.h>
|
||||
#endif
|
||||
|
||||
#ifdef USE_NSS
|
||||
#include <nspr.h>
|
||||
#include <plarenas.h>
|
||||
#endif
|
||||
|
||||
#define ENABLE_CURLX_PRINTF
|
||||
/* use our own printf() functions */
|
||||
#include "curlx.h"
|
||||
|
|
@ -213,14 +208,6 @@ static void main_free(struct GlobalConfig *config)
|
|||
/* Cleanup the easy handle */
|
||||
/* Main cleanup */
|
||||
curl_global_cleanup();
|
||||
#ifdef USE_NSS
|
||||
if(PR_Initialized()) {
|
||||
/* prevent valgrind from reporting still reachable mem from NSPR arenas */
|
||||
PL_ArenaFinish();
|
||||
/* prevent valgrind from reporting possibly lost memory (fd cache, ...) */
|
||||
PR_Cleanup();
|
||||
}
|
||||
#endif
|
||||
free_globalconfig(config);
|
||||
|
||||
/* Free the config structures */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue