diff options
| author | Juanma Barranquero | 2012-05-02 13:33:49 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2012-05-02 13:33:49 +0200 |
| commit | 069a7756f78b308730e862daf0a6711f4cd642db (patch) | |
| tree | 7438966da9fb9798f72e94b28f532823b3502375 /lib-src/emacsclient.c | |
| parent | 7b97c76414846f8982b7f96afca4cda5e9ecfcc5 (diff) | |
| download | emacs-069a7756f78b308730e862daf0a6711f4cd642db.tar.gz emacs-069a7756f78b308730e862daf0a6711f4cd642db.zip | |
lib-src/emacsclient.c (min): Undef before redefining it.
Diffstat (limited to 'lib-src/emacsclient.c')
| -rw-r--r-- | lib-src/emacsclient.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index d8e9e256584..29504445407 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c | |||
| @@ -119,6 +119,9 @@ char *(getcwd) (char *, size_t); | |||
| 119 | # define IF_LINT(Code) /* empty */ | 119 | # define IF_LINT(Code) /* empty */ |
| 120 | #endif | 120 | #endif |
| 121 | 121 | ||
| 122 | #ifdef min | ||
| 123 | #undef min | ||
| 124 | #endif | ||
| 122 | #define min(x, y) (((x) < (y)) ? (x) : (y)) | 125 | #define min(x, y) (((x) < (y)) ? (x) : (y)) |
| 123 | 126 | ||
| 124 | 127 | ||