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/gmalloc.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/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index 47046cc6747..3456ff0ec6f 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c | |||
| @@ -1303,7 +1303,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. | |||
| 1303 | or (US mail) as Mike Haertel c/o Free Software Foundation. */ | 1303 | or (US mail) as Mike Haertel c/o Free Software Foundation. */ |
| 1304 | 1304 | ||
| 1305 | #ifndef min | 1305 | #ifndef min |
| 1306 | #define min(A, B) ((A) < (B) ? (A) : (B)) | 1306 | #define min(a, b) ((a) < (b) ? (a) : (b)) |
| 1307 | #endif | 1307 | #endif |
| 1308 | 1308 | ||
| 1309 | /* Debugging hook for realloc. */ | 1309 | /* Debugging hook for realloc. */ |