projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-222
[awesomized/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index 2c150f9048a620fc7dcbf1d0831c624997a0a4d7..24bc3b8d18352da7d19656678e1cd6ef79d62a57 100644
(file)
--- a/
libtest/memcached.cc
+++ b/
libtest/memcached.cc
@@
-188,13
+188,13
@@
public:
return true;
}
return true;
}
- bool build(
size_t argc, const char *argv[]
);
+ bool build();
};
#include <sstream>
};
#include <sstream>
-bool Memcached::build(
size_t argc, const char *argv[]
)
+bool Memcached::build()
{
if (getuid() == 0 or geteuid() == 0)
{
{
if (getuid() == 0 or geteuid() == 0)
{
@@
-202,7
+202,8
@@
bool Memcached::build(size_t argc, const char *argv[])
}
add_option("-l", "localhost");
}
add_option("-l", "localhost");
-#ifndef TARGET_OS_OSX
+#ifdef __APPLE__
+#else
add_option("-m", "128");
add_option("-M");
#endif
add_option("-m", "128");
add_option("-M");
#endif
@@
-212,16
+213,6
@@
bool Memcached::build(size_t argc, const char *argv[])
add_option(sasl());
}
add_option(sasl());
}
- for (size_t x= 0 ; x < argc ; x++)
- {
- if (argv[x] == NULL)
- {
- break;
- }
-
- add_option(argv[x]);
- }
-
return true;
}
return true;
}