diff options
| author | Trond Norbye <trond.norbye@gmail.com> | 2011-08-12 15:55:00 +0200 |
|---|---|---|
| committer | Trond Norbye <trond.norbye@gmail.com> | 2011-08-12 15:55:00 +0200 |
| commit | bbafc072774d49b6c85bc4c3788a343640e67066 (patch) | |
| tree | 486508475de529360ccb8547d644f6b252159b40 | |
| parent | cb6290cd99a1aa937d1bcee9bac88c747cfe177f (diff) | |
| download | memcached-bbafc072774d49b6c85bc4c3788a343640e67066.tar.gz | |
Don't include stdbool.h when included from C++
| -rw-r--r-- | include/memcached/engine.h | 5 | ||||
| -rw-r--r-- | include/memcached/extension.h | 3 | ||||
| -rw-r--r-- | include/memcached/types.h | 5 |
3 files changed, 11 insertions, 2 deletions
diff --git a/include/memcached/engine.h b/include/memcached/engine.h index 6acea49..c42daa2 100644 --- a/include/memcached/engine.h +++ b/include/memcached/engine.h @@ -2,8 +2,11 @@ #ifndef MEMCACHED_ENGINE_H #define MEMCACHED_ENGINE_H -#include <sys/types.h> +#ifndef __cplusplus #include <stdbool.h> +#endif + +#include <sys/types.h> #include <stdint.h> #include <stdio.h> diff --git a/include/memcached/extension.h b/include/memcached/extension.h index 6ec0040..5dce67b 100644 --- a/include/memcached/extension.h +++ b/include/memcached/extension.h @@ -2,7 +2,10 @@ #ifndef MEMCACHED_EXTENSION_H #define MEMCACHED_EXTENSION_H +#ifndef __cplusplus #include <stdbool.h> +#endif + #include <stdint.h> #include <memcached/engine_common.h> #include <memcached/protocol_binary.h> diff --git a/include/memcached/types.h b/include/memcached/types.h index e340310..e1e26ad 100644 --- a/include/memcached/types.h +++ b/include/memcached/types.h @@ -2,9 +2,12 @@ #define MEMCACHED_TYPES_H 1 #include <sys/types.h> -#include <stdbool.h> #include <stdint.h> +#ifndef __cplusplus +#include <stdbool.h> +#endif + #ifdef __WIN32__ struct iovec { size_t iov_len; |