Mercurial > hg > xemacs-beta

comparison src/text.h @ 4853:d35e231d347d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build problems -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-01-13 Ben Wing <ben@xemacs.org> * specifier.c (specifier_instance_from_inst_list): Don't declare an unused variable, (void) 0 is enough. * text.h: Don't use USED_IF_MULE_OR_CHECK_TEXT().
author Ben Wing <ben@xemacs.org>
date Wed, 13 Jan 2010 19:43:16 -0600
parents b3ea9c582280
children 19a72041c5ed
comparison
equal deleted inserted replaced
4852:e0138eaaca0c 4853:d35e231d347d
768 (ptr, 1, fmt). 768 (ptr, 1, fmt).
769 */ 769 */
770 770
771 DECLARE_INLINE_HEADER ( 771 DECLARE_INLINE_HEADER (
772 Bytecount 772 Bytecount
773 itext_ichar_len_fmt (const Ibyte *USED_IF_MULE_OR_CHECK_TEXT (ptr), 773 itext_ichar_len_fmt (const Ibyte *ptr, Internal_Format fmt)
774 Internal_Format fmt)
775 ) 774 )
776 { 775 {
777 switch (fmt) 776 switch (fmt)
778 { 777 {
779 case FORMAT_DEFAULT: 778 case FORMAT_DEFAULT:
1057 void resize_string (Lisp_Object s, Bytecount pos, Bytecount delta); 1056 void resize_string (Lisp_Object s, Bytecount pos, Bytecount delta);
1058 1057
1059 /* Convert a byte index into a string into a char index. */ 1058 /* Convert a byte index into a string into a char index. */
1060 DECLARE_INLINE_HEADER ( 1059 DECLARE_INLINE_HEADER (
1061 Charcount 1060 Charcount
1062 string_index_byte_to_char (Lisp_Object USED_IF_MULE_OR_CHECK_TEXT (s), 1061 string_index_byte_to_char (Lisp_Object s, Bytecount idx)
1063 Bytecount idx)
1064 ) 1062 )
1065 { 1063 {
1066 Charcount retval; 1064 Charcount retval;
1067 ASSERT_VALID_BYTE_STRING_INDEX_UNSAFE (s, idx); 1065 ASSERT_VALID_BYTE_STRING_INDEX_UNSAFE (s, idx);
1068 #ifdef MULE 1066 #ifdef MULE
1085 } 1083 }
1086 1084
1087 /* Convert a char index into a string into a byte index. */ 1085 /* Convert a char index into a string into a byte index. */
1088 DECLARE_INLINE_HEADER ( 1086 DECLARE_INLINE_HEADER (
1089 Bytecount 1087 Bytecount
1090 string_index_char_to_byte (Lisp_Object USED_IF_MULE_OR_CHECK_TEXT (s), 1088 string_index_char_to_byte (Lisp_Object s, Charcount idx)
1091 Charcount idx)
1092 ) 1089 )
1093 { 1090 {
1094 Bytecount retval; 1091 Bytecount retval;
1095 ASSERT_VALID_CHAR_STRING_INDEX_UNSAFE (s, idx); 1092 ASSERT_VALID_CHAR_STRING_INDEX_UNSAFE (s, idx);
1096 #ifdef MULE 1093 #ifdef MULE
1113 1110
1114 /* Convert a substring length (starting at byte offset OFF) from bytes to 1111 /* Convert a substring length (starting at byte offset OFF) from bytes to
1115 chars. */ 1112 chars. */
1116 DECLARE_INLINE_HEADER ( 1113 DECLARE_INLINE_HEADER (
1117 Charcount 1114 Charcount
1118 string_offset_byte_to_char_len (Lisp_Object USED_IF_MULE_OR_CHECK_TEXT (s), 1115 string_offset_byte_to_char_len (Lisp_Object s, Bytecount off, Bytecount len)
1119 Bytecount USED_IF_MULE_OR_CHECK_TEXT (off),
1120 Bytecount len)
1121 ) 1116 )
1122 { 1117 {
1123 Charcount retval; 1118 Charcount retval;
1124 ASSERT_VALID_BYTE_STRING_INDEX_UNSAFE (s, off); 1119 ASSERT_VALID_BYTE_STRING_INDEX_UNSAFE (s, off);
1125 ASSERT_VALID_BYTE_STRING_INDEX_UNSAFE (s, off + len); 1120 ASSERT_VALID_BYTE_STRING_INDEX_UNSAFE (s, off + len);
1144 1139
1145 /* Convert a substring length (starting at byte offset OFF) from chars to 1140 /* Convert a substring length (starting at byte offset OFF) from chars to
1146 bytes. */ 1141 bytes. */
1147 DECLARE_INLINE_HEADER ( 1142 DECLARE_INLINE_HEADER (
1148 Bytecount 1143 Bytecount
1149 string_offset_char_to_byte_len (Lisp_Object USED_IF_MULE_OR_CHECK_TEXT (s), 1144 string_offset_char_to_byte_len (Lisp_Object s, Bytecount off, Charcount len)
1150 Bytecount USED_IF_MULE_OR_CHECK_TEXT (off),
1151 Charcount len)
1152 ) 1145 )
1153 { 1146 {
1154 Bytecount retval; 1147 Bytecount retval;
1155 ASSERT_VALID_BYTE_STRING_INDEX_UNSAFE (s, off); 1148 ASSERT_VALID_BYTE_STRING_INDEX_UNSAFE (s, off);
1156 #ifdef MULE 1149 #ifdef MULE