diff options
| author | Richard M. Stallman | 1996-02-08 21:58:53 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-02-08 21:58:53 +0000 |
| commit | e4b68333a91de6400e2c0906dee7054eb200364e (patch) | |
| tree | a4a630b8804093684069f06f55fc76c76b77389a /src | |
| parent | 9c35997bcbaced9aef89c62f429666dfa58747c3 (diff) | |
| download | emacs-e4b68333a91de6400e2c0906dee7054eb200364e.tar.gz emacs-e4b68333a91de6400e2c0906dee7054eb200364e.zip | |
(min, max): Don't define if already defined.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c index 091690e1d19..1c22b48e0b7 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -115,8 +115,12 @@ extern void _XEditResCheckMessages (); | |||
| 115 | #include <X11/Xlibint.h> | 115 | #include <X11/Xlibint.h> |
| 116 | #endif | 116 | #endif |
| 117 | 117 | ||
| 118 | #ifndef min | ||
| 118 | #define min(a,b) ((a)<(b) ? (a) : (b)) | 119 | #define min(a,b) ((a)<(b) ? (a) : (b)) |
| 120 | #endif | ||
| 121 | #ifndef max | ||
| 119 | #define max(a,b) ((a)>(b) ? (a) : (b)) | 122 | #define max(a,b) ((a)>(b) ? (a) : (b)) |
| 123 | #endif | ||
| 120 | 124 | ||
| 121 | /* This is a chain of structures for all the X displays currently in use. */ | 125 | /* This is a chain of structures for all the X displays currently in use. */ |
| 122 | struct x_display_info *x_display_list; | 126 | struct x_display_info *x_display_list; |