[Emacs-diffs] trunk r117226: Improve AIX-related merge from emacs-24.

[Paul Eggert]

------------------------------------------------------------
revno: 117226
revision-id: address@hidden
parent: address@hidden
author: Paul Eggert  <address@hidden>
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2014-06-01 23:08:49 -0700
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/conf_post.h                conf_post.h-20120730211826-q0qbxxwh2emw52hd-1
  src/lisp.h                     lisp.h-20091113204419-o5vbwnq5f7feedwu-253

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-02 00:18:22 +0000
+++ b/src/ChangeLog     2014-06-02 06:08:49 +0000
@@ -1,5 +1,10 @@
 2014-06-02  Paul Eggert  <address@hidden>
 
+       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.
+
        * frame.c (x_set_frame_parameters): Don't read uninitialized storage.
 
 2014-06-02  Jan Djärv  <address@hidden>

=== modified file 'src/conf_post.h'
--- a/src/conf_post.h   2014-06-02 00:18:22 +0000
+++ b/src/conf_post.h   2014-06-02 06:08:49 +0000
@@ -309,10 +309,7 @@
 /* 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

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2014-06-02 00:18:22 +0000
+++ b/src/lisp.h        2014-06-02 06:08:49 +0000
@@ -59,16 +59,6 @@
 # define ENUMABLE(val) 0
 #endif
 
-/* On AIX 7.1 ENUMABLE should return true when possible, otherwise the
-   linker can optimize the symbols away, making it harder to debug.
-   This was discovered only late in the release process, so to play it
-   safe for now, non-AIX platforms do not use enums for debugging symbols.
-   FIXME: remove this comment and the following four lines of code.  */
-#ifndef _AIX
-# undef ENUMABLE
-# define ENUMABLE(val) 0
-#endif
-
 #define DEFINE_GDB_SYMBOL_ENUM(id) enum { id = id##_val };
 #if defined MAIN_PROGRAM
 # define DEFINE_GDB_SYMBOL_BEGIN(type, id) type const id EXTERNALLY_VISIBLE