Fossil SCM
Fix compiler warning about redefining min() when compiling with MinGW, cherrypick from [536fb1d6e0].
Commit
c738a1a6a787d7104424c51eee64b671cd5c437e
Parent
1b1fd23590ec1e4…
1 file changed
+3
-1
+3
-1
| --- src/merge3.c | ||
| +++ src/merge3.c | ||
| @@ -27,11 +27,13 @@ | ||
| 27 | 27 | #define DEBUG(X) |
| 28 | 28 | #define ISDEBUG 0 |
| 29 | 29 | #endif |
| 30 | 30 | |
| 31 | 31 | /* The minimum of two integers */ |
| 32 | -#define min(A,B) (A<B?A:B) | |
| 32 | +#ifndef min | |
| 33 | +# define min(A,B) (A<B?A:B) | |
| 34 | +#endif | |
| 33 | 35 | |
| 34 | 36 | /* |
| 35 | 37 | ** Compare N lines of text from pV1 and pV2. If the lines |
| 36 | 38 | ** are the same, return true. Return false if one or more of the N |
| 37 | 39 | ** lines are different. |
| 38 | 40 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -27,11 +27,13 @@ | |
| 27 | #define DEBUG(X) |
| 28 | #define ISDEBUG 0 |
| 29 | #endif |
| 30 | |
| 31 | /* The minimum of two integers */ |
| 32 | #define min(A,B) (A<B?A:B) |
| 33 | |
| 34 | /* |
| 35 | ** Compare N lines of text from pV1 and pV2. If the lines |
| 36 | ** are the same, return true. Return false if one or more of the N |
| 37 | ** lines are different. |
| 38 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -27,11 +27,13 @@ | |
| 27 | #define DEBUG(X) |
| 28 | #define ISDEBUG 0 |
| 29 | #endif |
| 30 | |
| 31 | /* The minimum of two integers */ |
| 32 | #ifndef min |
| 33 | # define min(A,B) (A<B?A:B) |
| 34 | #endif |
| 35 | |
| 36 | /* |
| 37 | ** Compare N lines of text from pV1 and pV2. If the lines |
| 38 | ** are the same, return true. Return false if one or more of the N |
| 39 | ** lines are different. |
| 40 |