projects / packages / mysql.git / blame
| Commit | Line | Data |
|---|---|---|
| af6b316a | 1 | diff -ur -x '*.Po' -x '*.log' -x '*.t' -x '*.Plo' mysql-5.1.22-rc.orig/include/my_global.h mysql-5.1.22-rc.mod/include/my_global.h |
| 2 | --- mysql-5.1.22-rc.orig/include/my_global.h 2007-09-24 12:30:24.000000000 +0200 | |
| 3 | +++ mysql-5.1.22-rc.mod/include/my_global.h 2007-11-08 14:42:06.000000000 +0100 | |
| 4 | @@ -563,10 +563,6 @@ | |
| 11936b50 AM |
5 | #endif |
| 6 | ||
| 7 | /* Define some useful general macros */ | |
| 8 | -#if !defined(max) | |
| 9 | -#define max(a, b) ((a) > (b) ? (a) : (b)) | |
| 10 | -#define min(a, b) ((a) < (b) ? (a) : (b)) | |
| 6e51408c | 11 | -#endif |
| 11936b50 AM |
12 | |
| 13 | #if !defined(HAVE_UINT) | |
| 6e51408c | 14 | #undef HAVE_UINT |
| af6b316a | 15 | @@ -1502,6 +1498,11 @@ |
| 6e51408c | 16 | #endif |
| 6e51408c | 17 | #endif |
| 6e51408c | 18 | |
| af6b316a | 19 | +#if !defined(max) |
| 20 | +#define max(a, b) ((a) > (b) ? (a) : (b)) | |
| 21 | +#define min(a, b) ((a) < (b) ? (a) : (b)) | |
| 22 | +#endif | |
| 23 | + | |
| 24 | /* Length of decimal number represented by INT32. */ | |
| 25 | #define MY_INT32_NUM_DECIMAL_DIGITS 11 | |
| 6e51408c | 26 |