projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Remove exposed C++ namespace.
[m6w6/libmemcached]
/
libtest
/
has.cc
diff --git
a/libtest/has.cc
b/libtest/has.cc
index ba4bbfc65efd6af1aa31db34f11c9b3141bfee99..9b26b96b675dab7d2fef408cdcf99e276553758c 100644
(file)
--- a/
libtest/has.cc
+++ b/
libtest/has.cc
@@
-34,7
+34,7
@@
*
*/
*
*/
-#include
<config.h>
+#include
"libtest/yatlcon.h"
#include <libtest/common.h>
#include <cstdlib>
#include <libtest/common.h>
#include <cstdlib>
@@
-44,28
+44,34
@@
namespace libtest {
bool has_libmemcached(void)
{
bool has_libmemcached(void)
{
+#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
if (HAVE_LIBMEMCACHED)
{
return true;
}
if (HAVE_LIBMEMCACHED)
{
return true;
}
+#endif
return false;
}
bool has_libdrizzle(void)
{
return false;
}
bool has_libdrizzle(void)
{
+#if defined(HAVE_LIBDRIZZLE) && HAVE_LIBDRIZZLE
if (HAVE_LIBDRIZZLE)
{
return true;
}
if (HAVE_LIBDRIZZLE)
{
return true;
}
+#endif
return false;
}
bool has_postgres_support(void)
{
return false;
}
bool has_postgres_support(void)
{
- if (getenv("POSTGES_IS_RUNNING_AND_SETUP"))
+ char *getenv_ptr;
+ if (bool((getenv_ptr= getenv("POSTGES_IS_RUNNING_AND_SETUP"))))
{
{
+ (void)(getenv_ptr);
if (HAVE_LIBPQ)
{
return true;
if (HAVE_LIBPQ)
{
return true;
@@
-78,13
+84,16
@@
bool has_postgres_support(void)
bool has_gearmand()
{
bool has_gearmand()
{
+#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
if (HAVE_GEARMAND_BINARY)
{
std::stringstream arg_buffer;
if (HAVE_GEARMAND_BINARY)
{
std::stringstream arg_buffer;
- if (getenv("PWD") and strcmp(MEMCACHED_BINARY, "gearmand/gearmand") == 0)
+ char *getenv_ptr;
+ if (bool((getenv_ptr= getenv("PWD"))) and
+ ((strcmp(GEARMAND_BINARY, "./gearmand/gearmand") == 0) or (strcmp(GEARMAND_BINARY, "gearmand/gearmand") == 0)))
{
{
- arg_buffer << getenv
("PWD")
;
+ arg_buffer << getenv
_ptr
;
arg_buffer << "/";
}
arg_buffer << GEARMAND_BINARY;
arg_buffer << "/";
}
arg_buffer << GEARMAND_BINARY;
@@
-94,12
+103,14
@@
bool has_gearmand()
return true;
}
}
return true;
}
}
+#endif
return false;
}
bool has_drizzled()
{
return false;
}
bool has_drizzled()
{
+#if defined(HAVE_DRIZZLED_BINARY) && HAVE_DRIZZLED_BINARY
if (HAVE_DRIZZLED_BINARY)
{
if (access(DRIZZLED_BINARY, X_OK) == 0)
if (HAVE_DRIZZLED_BINARY)
{
if (access(DRIZZLED_BINARY, X_OK) == 0)
@@
-107,12
+118,14
@@
bool has_drizzled()
return true;
}
}
return true;
}
}
+#endif
return false;
}
bool has_mysqld()
{
return false;
}
bool has_mysqld()
{
+#if defined(HAVE_MYSQLD_BUILD) && HAVE_MYSQLD_BUILD
if (HAVE_MYSQLD_BUILD)
{
if (access(MYSQLD_BINARY, X_OK) == 0)
if (HAVE_MYSQLD_BUILD)
{
if (access(MYSQLD_BINARY, X_OK) == 0)
@@
-120,19
+133,23
@@
bool has_mysqld()
return true;
}
}
return true;
}
}
+#endif
return false;
}
bool has_memcached()
{
return false;
}
bool has_memcached()
{
+#if defined(HAVE_MEMCACHED_BINARY) && HAVE_MEMCACHED_BINARY
if (HAVE_MEMCACHED_BINARY)
{
std::stringstream arg_buffer;
if (HAVE_MEMCACHED_BINARY)
{
std::stringstream arg_buffer;
- if (getenv("PWD") and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0)
+
+ char *getenv_ptr;
+ if (bool((getenv_ptr= getenv("PWD"))) and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0)
{
{
- arg_buffer << getenv
("PWD")
;
+ arg_buffer << getenv
_ptr
;
arg_buffer << "/";
}
arg_buffer << MEMCACHED_BINARY;
arg_buffer << "/";
}
arg_buffer << MEMCACHED_BINARY;
@@
-142,6
+159,7
@@
bool has_memcached()
return true;
}
}
return true;
}
}
+#endif
return false;
}
return false;
}