projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
See if we can clean up error reporting on one test for Ubuntu 12.04
[awesomized/libmemcached]
/
libtest
/
http.cc
diff --git
a/libtest/http.cc
b/libtest/http.cc
index 59497d69760d3417f44f85d398bfc99ed69b0282..621c714c2f1c616166a105d21b7c0fca90d6bdbd 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,23
+47,23
@@
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))
{
if (curl_global_init(CURL_GLOBAL_ALL))
{
-
fatal_message
("curl_global_init(CURL_GLOBAL_ALL) failed");
+
FATAL
("curl_global_init(CURL_GLOBAL_ALL) failed");
}
#endif
if (atexit(cleanup_curl))
{
}
#endif
if (atexit(cleanup_curl))
{
-
fatal_message
("atexit() failed");
+
FATAL
("atexit() failed");
}
}
}
}
@@
-73,7
+73,7
@@
static void initialize_curl(void)
int ret;
if ((ret= pthread_once(&start_key_once, initialize_curl_startup)) != 0)
{
int ret;
if ((ret= pthread_once(&start_key_once, initialize_curl_startup)) != 0)
{
-
fatal_message
(strerror(ret));
+
FATAL
(strerror(ret));
}
}
}
}