Merge from emacs-24; up to 2014-05-29T17:16:00Z!dmantipov@yandex.ru

[gnu-emacs] / src / conf_post.h

diff --git a/src/conf_post.h b/src/conf_post.h
index 6f6af3d3e02d246d87e25f63eb78b8146a90903d..9c82d7d2a71c7b4402c13c446e018d95878d0a77 100644 (file)
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -311,8 +311,13 @@ extern void _DebPrint (const char *fmt, ...);
    and allocate (offsetof (struct s, name) + N * sizeof (t)) bytes.
 
    This macro used to expand to something different on pre-C99 compilers.
+   IBM xlc 12.1 claims to do C99 but mishandles flexible array members.
    FIXME: Remove it, and remove all uses.  */
-#define FLEXIBLE_ARRAY_MEMBER
+#ifdef __IBMC__
+# define FLEXIBLE_ARRAY_MEMBER 1
+#else
+# define FLEXIBLE_ARRAY_MEMBER
+#endif
 
 /* Use this to suppress gcc's `...may be used before initialized' warnings. */
 #ifdef lint