Mercurial > hg > xemacs-beta
comparison src/buffer.h @ 4860:edc0cd26b4a8
fix more build problems
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-14 Ben Wing <ben@xemacs.org>
* buffer.h:
* compiler.h:
Don't use USED_IF_MULE_OR_CHECK_TEXT in buffer.h. Eliminate since
not used anywhere any more.
* font-mgr.c (fontset_to_list):
* font-mgr.c (Ffc_config_substitute):
Don't use Fsignal() as it may return. Use signal_error() instead
or a more specific function such as invalid_state() or wtaerror().
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Thu, 14 Jan 2010 06:00:09 -0600 |
| parents | 141c2920ea48 |
| children | 6ef8256a020a |
comparison
equal
deleted
inserted
replaced
| 4859:262b29aedd54 | 4860:edc0cd26b4a8 |
|---|---|
| 541 VALIDATE_BYTEBPOS_BACKWARD (buf, x); \ | 541 VALIDATE_BYTEBPOS_BACKWARD (buf, x); \ |
| 542 } while (0) | 542 } while (0) |
| 543 | 543 |
| 544 DECLARE_INLINE_HEADER ( | 544 DECLARE_INLINE_HEADER ( |
| 545 Bytebpos | 545 Bytebpos |
| 546 prev_bytebpos (struct buffer *USED_IF_MULE_OR_CHECK_TEXT (buf), Bytebpos x) | 546 prev_bytebpos (struct buffer *buf, Bytebpos x) |
| 547 ) | 547 ) |
| 548 { | 548 { |
| 549 DEC_BYTEBPOS (buf, x); | 549 DEC_BYTEBPOS (buf, x); |
| 550 return x; | 550 return x; |
| 551 } | 551 } |
| 552 | 552 |
| 553 DECLARE_INLINE_HEADER ( | 553 DECLARE_INLINE_HEADER ( |
| 554 Bytebpos | 554 Bytebpos |
| 555 next_bytebpos (struct buffer *USED_IF_MULE_OR_CHECK_TEXT (buf), Bytebpos x) | 555 next_bytebpos (struct buffer *buf, Bytebpos x) |
| 556 ) | 556 ) |
| 557 { | 557 { |
| 558 INC_BYTEBPOS (buf, x); | 558 INC_BYTEBPOS (buf, x); |
| 559 return x; | 559 return x; |
| 560 } | 560 } |
| 585 | 585 |
| 586 /* Given a Charbpos, return the equivalent Bytebpos. */ | 586 /* Given a Charbpos, return the equivalent Bytebpos. */ |
| 587 | 587 |
| 588 DECLARE_INLINE_HEADER ( | 588 DECLARE_INLINE_HEADER ( |
| 589 Bytebpos | 589 Bytebpos |
| 590 charbpos_to_bytebpos (struct buffer *USED_IF_MULE_OR_CHECK_TEXT (buf), | 590 charbpos_to_bytebpos (struct buffer *buf, Charbpos x) |
| 591 Charbpos x) | |
| 592 ) | 591 ) |
| 593 { | 592 { |
| 594 Bytebpos retval; | 593 Bytebpos retval; |
| 595 ASSERT_VALID_CHARBPOS_UNSAFE (buf, x); | 594 ASSERT_VALID_CHARBPOS_UNSAFE (buf, x); |
| 596 #ifdef MULE | 595 #ifdef MULE |
| 618 | 617 |
| 619 /* Given a Bytebpos, return the equivalent Charbpos. */ | 618 /* Given a Bytebpos, return the equivalent Charbpos. */ |
| 620 | 619 |
| 621 DECLARE_INLINE_HEADER ( | 620 DECLARE_INLINE_HEADER ( |
| 622 Charbpos | 621 Charbpos |
| 623 bytebpos_to_charbpos (struct buffer *USED_IF_MULE_OR_CHECK_TEXT (buf), | 622 bytebpos_to_charbpos (struct buffer *buf, Bytebpos x) |
| 624 Bytebpos x) | |
| 625 ) | 623 ) |
| 626 { | 624 { |
| 627 Charbpos retval; | 625 Charbpos retval; |
| 628 ASSERT_VALID_BYTEBPOS_UNSAFE (buf, x); | 626 ASSERT_VALID_BYTEBPOS_UNSAFE (buf, x); |
| 629 #ifdef MULE | 627 #ifdef MULE |