Improve AIX-related merge from emacs-24.

* conf_post.h (FLEXIBLE_ARRAY_MEMBER): Fix comment.
* lisp.h (ENUMABLE) [!_AIX]: Don't define to 0 merely because we're
not on AIX; since we're on the trunk we can use enums more broadly.

1 files changed, 1 insertions, 4 deletions

diff --git a/src/conf_post.h b/src/conf_post.h
index 9c82d7d2a71..a995acfd915 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -309,10 +309,7 @@ extern void _DebPrint (const char *fmt, ...);
 /* To use the struct hack with N elements, declare the struct like this:
      struct s { ...; t name[FLEXIBLE_ARRAY_MEMBER]; };
    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.  */
+   IBM xlc 12.1 claims to do C99 but mishandles flexible array members.  */
 #ifdef __IBMC__
 # define FLEXIBLE_ARRAY_MEMBER 1
 #else