diff options
| author | Dmitry Antipov | 2014-10-03 08:35:10 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2014-10-03 08:35:10 +0400 |
| commit | 6846b0036a0ff938d93c2d4df0f177dab3e06623 (patch) | |
| tree | 58d57f74be7d3f7b9f4c01d7380528e6cbe63c30 /src/coding.c | |
| parent | 11bd10a7df907289382bd6f06753e274376d7629 (diff) | |
| download | emacs-6846b0036a0ff938d93c2d4df0f177dab3e06623.tar.gz emacs-6846b0036a0ff938d93c2d4df0f177dab3e06623.zip | |
Consistently use min and max macros from lisp.h.
* coding.c (min, max):
* font.c (MAX):
* unexhp9k800.c (min):
* unexw32.c (min, max): Use definitions from lisp.h.
* regex.c (MAX, MIN) [!emacs]: Define own max and min as such.
Adjust users.
* gmalloc.c (min): Tiny style change.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/coding.c b/src/coding.c index ed107a297ba..0337c0df60e 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -642,15 +642,6 @@ static enum coding_category coding_priorities[coding_category_max]; | |||
| 642 | Nth coding category. */ | 642 | Nth coding category. */ |
| 643 | static struct coding_system coding_categories[coding_category_max]; | 643 | static struct coding_system coding_categories[coding_category_max]; |
| 644 | 644 | ||
| 645 | /*** Commonly used macros and functions ***/ | ||
| 646 | |||
| 647 | #ifndef min | ||
| 648 | #define min(a, b) ((a) < (b) ? (a) : (b)) | ||
| 649 | #endif | ||
| 650 | #ifndef max | ||
| 651 | #define max(a, b) ((a) > (b) ? (a) : (b)) | ||
| 652 | #endif | ||
| 653 | |||
| 654 | /* Encode a flag that can be nil, something else, or t as -1, 0, 1. */ | 645 | /* Encode a flag that can be nil, something else, or t as -1, 0, 1. */ |
| 655 | 646 | ||
| 656 | static int | 647 | static int |