projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in updated yatl.
[m6w6/libmemcached]
/
libtest
/
http.cc
diff --git
a/libtest/http.cc
b/libtest/http.cc
index 59497d69760d3417f44f85d398bfc99ed69b0282..917e668fad7df9a060e4b429b86af5520ec04a64 100644
(file)
--- a/
libtest/http.cc
+++ b/
libtest/http.cc
@@
-34,11
+34,11
@@
*
*/
*
*/
-#include "
mem_config
.h"
+#include "
libtest/yatlcon
.h"
#include <libtest/common.h>
#include <libtest/common.h>
-#if defined(HAVE_
CURL_CURL_H) && HAVE_CURL_CURL_H
+#if defined(HAVE_
LIBCURL) && HAVE_LIBCURL
#include <curl/curl.h>
#else
class CURL;
#include <curl/curl.h>
#else
class CURL;
@@
-47,14
+47,14
@@
class CURL;
static void cleanup_curl(void)
{
static void cleanup_curl(void)
{
-#if defined(HAVE_
CURL_CURL_H) && HAVE_CURL_CURL_H
+#if defined(HAVE_
LIBCURL) && HAVE_LIBCURL
curl_global_cleanup();
#endif
}
static void initialize_curl_startup()
{
curl_global_cleanup();
#endif
}
static void initialize_curl_startup()
{
-#if defined(HAVE_
CURL_CURL_H) && HAVE_CURL_CURL_H
+#if defined(HAVE_
LIBCURL) && HAVE_LIBCURL
if (curl_global_init(CURL_GLOBAL_ALL))
{
fatal_message("curl_global_init(CURL_GLOBAL_ALL) failed");
if (curl_global_init(CURL_GLOBAL_ALL))
{
fatal_message("curl_global_init(CURL_GLOBAL_ALL) failed");