summaryrefslogtreecommitdiff
path: root/config.h.in
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2013-12-01 21:54:14 +0100
committerGuido Günther <agx@sigxcpu.org>2013-12-01 21:54:14 +0100
commit8bfdc7fb9c5bfdace7b4d17d6394bf8f18faf405 (patch)
treecfff04400c4eb8c471ab59192a5fa54cb4bfa3f2 /config.h.in
parent54c6758e1ee7286ca1ad3a04fa207d18a23cfc24 (diff)
New upstream version 1.2.0~rc2
Diffstat (limited to 'config.h.in')
-rw-r--r--config.h.in23
1 files changed, 17 insertions, 6 deletions
diff --git a/config.h.in b/config.h.in
index 6f9327d2b..2186965ef 100644
--- a/config.h.in
+++ b/config.h.in
@@ -2307,6 +2307,9 @@
/* whether fuse >= 2.8.6 is available */
#undef WITH_FUSE
+/* whether glusterfs-api >= 3.4.1 is available */
+#undef WITH_GLUSTERFS
+
/* whether GNUTLS is available for encryption */
#undef WITH_GNUTLS
@@ -2421,6 +2424,9 @@
/* whether FS backend for storage driver is enabled */
#undef WITH_STORAGE_FS
+/* whether Gluster backend for storage driver is enabled */
+#undef WITH_STORAGE_GLUSTER
+
/* whether iSCSI backend for storage driver is enabled */
#undef WITH_STORAGE_ISCSI
@@ -2570,15 +2576,20 @@
'reference to static identifier "f" in extern inline function'.
This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
- Suppress the use of extern inline on problematic Apple configurations, as
- Libc at least through Libc-825.26 (2013-04-09) mishandles it; see, e.g.,
+ Suppress the use of extern inline on problematic Apple configurations.
+ OS X 10.8 and earlier mishandle it; see, e.g.,
<http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
+ OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
+ for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
Perhaps Apple will fix this some day. */
#if (defined __APPLE__ \
- && ((! defined _DONT_USE_CTYPE_INLINE_ \
- && (defined __GNUC__ || defined __cplusplus)) \
- || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
- && defined __GNUC__ && ! defined __cplusplus)))
+ && (defined __header_inline \
+ ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
+ && ! defined __clang__) \
+ : ((! defined _DONT_USE_CTYPE_INLINE_ \
+ && (defined __GNUC__ || defined __cplusplus)) \
+ || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
+ && defined __GNUC__ && ! defined __cplusplus))))
# define _GL_EXTERN_INLINE_APPLE_BUG
#endif
#if ((__GNUC__ \