aboutsummaryrefslogtreecommitdiffstats
path: root/src/term.c
diff options
context:
space:
mode:
authorPaul Eggert2013-11-03 22:09:03 -0800
committerPaul Eggert2013-11-03 22:09:03 -0800
commit91f2d272895257f23596075a0cc42e6e5f4e490f (patch)
tree5bcf0c44acc54bd56eef8394e50ff7d4cc24d5b3 /src/term.c
parent0a749fa0e64fc88bcd1772253774d7e44ecfe8ce (diff)
downloademacs-91f2d272895257f23596075a0cc42e6e5f4e490f.tar.gz
emacs-91f2d272895257f23596075a0cc42e6e5f4e490f.zip
Port to stricter C99 platforms.
Especially, C99 prohibits nesting a struct X inside struct Y if struct X has a flexible array member. Also, merge from gnulib, incorporating: 2013-11-03 intprops: port to Oracle Studio c99 * lib/intprops.h: Update from gnulib. * src/alloc.c (struct sdata): New type. (sdata): Implement in terms of struct sdata. Remove u member; all uses replaced by next_vector, set_next_vector. (SDATA_SELECTOR, SDATA_DATA, SDATA_DATA_OFFSET): Adjust to sdata change. (SDATA_DATA_OFFSET): Now a constant, not a macro. (struct sblock): Rename first_data member to data, which is now a flexible array member. All uses changed. (next_vector, set_next_vector, large_vector_vec): New functions. (vector_alignment): New constant. (roundup_size): Make it a multiple of ALIGNOF_STRUCT_LISP_VECTOR, too. (struct large-vector): Now merely a NEXT member, since the old approach ran afoul of stricter C99. All uses changed to use large_vector_vec or large_vector_offset. (large_vector_offset): New constant. * src/dispnew.c: Include tparam.h, for tgetent. Do not include term.h; no longer needed. * src/gnutls.c (Fgnutls_boot): Don't continue after calling a _Noreturn. * src/lisp.h (ENUM_BF) [__SUNPRO_C && __STDC__]: Use unsigned int. (struct Lisp_Vector): Use a flexible array member for contents, instead of a union with a member that is an array of size 1. All uses changed. (ALIGNOF_STRUCT_LISP_VECTOR): New constant, to make up for the fact that the struct no longer contains a union. (struct Lisp_Misc_Any, struct Lisp_Marker, struct Lisp_Overlay) (struct Lisp_Save_Value, struct Lisp_Free): Use unsigned, not int, for spacers, to avoid c99 warning. (union specbinding): Use unsigned, not bool, for bitfield, as bool is not portable to pre-C99 hosts.
Diffstat (limited to 'src/term.c')
-rw-r--r--src/term.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c
index b4c2e2560cc..929280865a5 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3478,7 +3478,7 @@ tty_menu_help_callback (char const *help_string, int pane, int item)
3478 Lisp_Object pane_name; 3478 Lisp_Object pane_name;
3479 Lisp_Object menu_object; 3479 Lisp_Object menu_object;
3480 3480
3481 first_item = XVECTOR (menu_items)->u.contents; 3481 first_item = XVECTOR (menu_items)->contents;
3482 if (EQ (first_item[0], Qt)) 3482 if (EQ (first_item[0], Qt))
3483 pane_name = first_item[MENU_ITEMS_PANE_NAME]; 3483 pane_name = first_item[MENU_ITEMS_PANE_NAME];
3484 else if (EQ (first_item[0], Qquote)) 3484 else if (EQ (first_item[0], Qquote))