aboutsummaryrefslogtreecommitdiffstats
path: root/src/chartab.c
diff options
context:
space:
mode:
authorPaul Eggert2012-08-18 16:53:43 -0700
committerPaul Eggert2012-08-18 16:53:43 -0700
commite757f1c6f393cf82057dbee0a4325b07f0fd55c4 (patch)
tree114b122ca03e38109f46b2aac0ab3334bc68a569 /src/chartab.c
parent51e6d6b2f5799ae3fc9c33930e0c4b456e1bbbdd (diff)
downloademacs-e757f1c6f393cf82057dbee0a4325b07f0fd55c4.tar.gz
emacs-e757f1c6f393cf82057dbee0a4325b07f0fd55c4.zip
port new setting code to Sun C 5.8 2005/10/13
* chartab.c, lisp.h (char_table_set, char_table_set_range): Return void, not Lisp_Object. Otherwise, the compiler complains about (A?B:C) where B is void and C is Lisp_Object when compiling CHAR_TABLE_SET, due to the recent change to the API of sub_char_table_set_contents.
Diffstat (limited to 'src/chartab.c')
-rw-r--r--src/chartab.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/chartab.c b/src/chartab.c
index 25d331b73e2..711a49ed397 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -411,7 +411,7 @@ sub_char_table_set (Lisp_Object table, int c, Lisp_Object val, int is_uniprop)
411 } 411 }
412} 412}
413 413
414Lisp_Object 414void
415char_table_set (Lisp_Object table, int c, Lisp_Object val) 415char_table_set (Lisp_Object table, int c, Lisp_Object val)
416{ 416{
417 struct Lisp_Char_Table *tbl = XCHAR_TABLE (table); 417 struct Lisp_Char_Table *tbl = XCHAR_TABLE (table);
@@ -434,7 +434,6 @@ char_table_set (Lisp_Object table, int c, Lisp_Object val)
434 if (ASCII_CHAR_P (c)) 434 if (ASCII_CHAR_P (c))
435 set_char_table_ascii (table, char_table_ascii (table)); 435 set_char_table_ascii (table, char_table_ascii (table));
436 } 436 }
437 return val;
438} 437}
439 438
440static void 439static void
@@ -476,7 +475,7 @@ sub_char_table_set_range (Lisp_Object table, int from, int to, Lisp_Object val,
476} 475}
477 476
478 477
479Lisp_Object 478void
480char_table_set_range (Lisp_Object table, int from, int to, Lisp_Object val) 479char_table_set_range (Lisp_Object table, int from, int to, Lisp_Object val)
481{ 480{
482 struct Lisp_Char_Table *tbl = XCHAR_TABLE (table); 481 struct Lisp_Char_Table *tbl = XCHAR_TABLE (table);
@@ -510,7 +509,6 @@ char_table_set_range (Lisp_Object table, int from, int to, Lisp_Object val)
510 if (ASCII_CHAR_P (from)) 509 if (ASCII_CHAR_P (from))
511 set_char_table_ascii (table, char_table_ascii (table)); 510 set_char_table_ascii (table, char_table_ascii (table));
512 } 511 }
513 return val;
514} 512}
515 513
516 514