diff options
| author | jsorg71 <jsorg71> | 2005-11-07 01:49:19 +0000 |
|---|---|---|
| committer | jsorg71 <jsorg71> | 2005-11-07 01:49:19 +0000 |
| commit | 9655dff4627c57cf27c8e16ffc1f7a4e9e4b8b91 (patch) | |
| tree | 614a43bbf19741720e10c93bfaeff9a8529ec60c /common/defines.h | |
| parent | 9df403d5236130c9f43ddfa8f35a15eec0cf36c8 (diff) | |
| download | xrdp-proprietary-9655dff4627c57cf27c8e16ffc1f7a4e9e4b8b91.tar.gz xrdp-proprietary-9655dff4627c57cf27c8e16ffc1f7a4e9e4b8b91.zip | |
MAKELONG should be lo, hi, not hi, lo
Diffstat (limited to 'common/defines.h')
| -rw-r--r-- | common/defines.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/common/defines.h b/common/defines.h index 77c7d75c..8dfba96b 100644 --- a/common/defines.h +++ b/common/defines.h @@ -30,11 +30,16 @@ #define DEBUG(args) #endif /* other macros */ +#undef MIN #define MIN(x1, x2) ((x1) < (x2) ? (x1) : (x2)) +#undef MAX #define MAX(x1, x2) ((x1) > (x2) ? (x1) : (x2)) +#undef HIWORD #define HIWORD(in) (((in) & 0xffff0000) >> 16) +#undef LOWORD #define LOWORD(in) ((in) & 0x0000ffff) -#define MAKELONG(hi, lo) ((((hi) & 0xffff) << 16) | ((lo) & 0xffff)) +#undef MAKELONG +#define MAKELONG(lo, hi) ((((hi) & 0xffff) << 16) | ((lo) & 0xffff)) #define MAKERECT(r, x, y, cx, cy) \ { (r).left = x; (r).top = y; (r).right = (x) + (cx); (r).bottom = (y) + (cy); } #define ISRECTEMPTY(r) (((r).right <= (r).left) || ((r).bottom <= (r).top)) |