projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
msvc support
[awesomized/libmemcached]
/
src
/
libmemcached
/
common.h
diff --git
a/src/libmemcached/common.h
b/src/libmemcached/common.h
index 4b025fb368c2d6de8181fb63eeb4655846148fce..eea5319b654c800dcecd20cbe867b67d65ae3db0 100644
(file)
--- a/
src/libmemcached/common.h
+++ b/
src/libmemcached/common.h
@@
-26,26
+26,16
@@
# include <cctype>
# include <cerrno>
# include <climits>
# include <cctype>
# include <cerrno>
# include <climits>
+# include <ciso646>
#else
#else
-# ifdef HAVE_STDDEF_H
-# include <stddef.h>
-# endif
-# ifdef HAVE_STDLIB_H
-# include <stdio.h>
-# endif
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
+# include <stddef.h>
+# include <stdio.h>
+# include <stdlib.h>
# include <string.h>
# include <string.h>
-# ifdef HAVE_TIME_H
-# include <time.h>
-# endif
-# ifdef HAVE_ERRNO_H
-# include <errno.h>
-# endif
-# ifdef HAVE_LIMITS_H
-# include <limits.h>
-# endif
+# include <time.h>
+# include <errno.h>
+# include <limits.h>
+# include <iso646.h>
#endif
#ifdef HAVE_SYS_UN_H
#endif
#ifdef HAVE_SYS_UN_H
@@
-56,13
+46,8
@@
# include <sys/time.h>
#endif
# include <sys/time.h>
#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <fcntl.h>
+#include <sys/types.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@
-89,11
+74,7
@@
#include "libmemcached/is.h"
typedef struct memcached_st Memcached;
#include "libmemcached/is.h"
typedef struct memcached_st Memcached;
-#ifdef HAVE_POLL_H
-# include <poll.h>
-#else
-# include "libmemcached/poll.h"
-#endif
+#include "libmemcached/poll.h"
#ifdef __cplusplus
memcached_instance_st *memcached_instance_fetch(memcached_st *ptr, uint32_t server_key);
#ifdef __cplusplus
memcached_instance_st *memcached_instance_fetch(memcached_st *ptr, uint32_t server_key);