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.
This commit is contained in:
Dmitry Antipov 2014-10-03 08:35:10 +04:00
parent 11bd10a7df
commit 6846b0036a
7 changed files with 26 additions and 32 deletions

View file

@ -642,15 +642,6 @@ static enum coding_category coding_priorities[coding_category_max];
Nth coding category. */
static struct coding_system coding_categories[coding_category_max];
/*** Commonly used macros and functions ***/
#ifndef min
#define min(a, b) ((a) < (b) ? (a) : (b))
#endif
#ifndef max
#define max(a, b) ((a) > (b) ? (a) : (b))
#endif
/* Encode a flag that can be nil, something else, or t as -1, 0, 1. */
static int