projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Disable silent rules so that we can view more in Jenkins.
[m6w6/libmemcached]
/
libtest
/
common.h
diff --git
a/libtest/common.h
b/libtest/common.h
index 20b482586402820dcf041e7e78665eb6a00575c1..90d8b6a8def0594cef3663b9c7d83ebe4bca8b64 100644
(file)
--- a/
libtest/common.h
+++ b/
libtest/common.h
@@
-46,45
+46,40
@@
#include <string>
#ifdef HAVE_SYS_TYPES_H
#include <string>
#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
+#
include <sys/types.h>
#endif
#ifdef HAVE_SYS_TIME_H
#endif
#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+#
include <sys/time.h>
#endif
#ifdef HAVE_SYS_WAIT_H
#endif
#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
+#
include <sys/wait.h>
#endif
#ifdef HAVE_SYS_RESOURCE_H
#endif
#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
+#
include <sys/resource.h>
#endif
#ifdef HAVE_FNMATCH_H
#endif
#ifdef HAVE_FNMATCH_H
-#include <fnmatch.h>
-#endif
-
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
+# include <fnmatch.h>
#endif
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#endif
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
-#ifdef HAVE_POLL_H
-# include <poll.h>
+#if defined(WIN32)
+# include "win32/wrappers.h"
+# define get_socket_errno() WSAGetLastError()
#else
#else
-# include "poll/poll.h"
-#endif
-
-#ifdef HAVE_SPAWN_H
-# include <spawn.h>
+# ifdef HAVE_UNISTD_H
+# include <unistd.h>
+# endif
+# define INVALID_SOCKET -1
+# define SOCKET_ERROR -1
+# define closesocket(a) close(a)
+# define get_socket_errno() errno
#endif
#include <libtest/test.hpp>
#endif
#include <libtest/test.hpp>
@@
-102,3
+97,25
@@
#include <libtest/dns.hpp>
#include <libtest/formatter.hpp>
#include <libtest/dns.hpp>
#include <libtest/formatter.hpp>
+struct FreeFromVector
+{
+ template <class T>
+ void operator() ( T* ptr) const
+ {
+ if (ptr)
+ {
+ free(ptr);
+ ptr= NULL;
+ }
+ }
+};
+
+struct DeleteFromVector
+{
+ template <class T>
+ void operator() ( T* ptr) const
+ {
+ delete ptr;
+ ptr= NULL;
+ }
+};