From 667ac01f9281017818f00349db0805a8de052d78 Mon Sep 17 00:00:00 2001 From: Amy Gale Ruth Bowersox Date: Fri, 6 Dec 2019 20:29:11 -0700 Subject: [PATCH] changes to wintype.h so as not to collide with bcm2835.h --- src/wintype.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/wintype.h b/src/wintype.h index 8fa5cd8..01a2401 100644 --- a/src/wintype.h +++ b/src/wintype.h @@ -133,8 +133,12 @@ typedef UINT64 TIMESTAMP; #define MAKEBOOL(val) ((val) ? TRUE : FALSE) #define OFFSETOF(struc, field) ((UINT_PTR)(&(((struc *)0)->field))) +#ifndef MIN #define MIN(x, y) (((x) < (y)) ? (x) : (y)) +#endif +#ifndef MAX #define MAX(x, y) (((x) > (y)) ? (x) : (y)) +#endif #define MAKEWORD(a, b) ((WORD)((((UINT_PTR)(a)) & 0xFF) | ((((UINT_PTR)(b)) & 0xFF) << 8))) #define MAKELONG(a, b) ((LONG)((((UINT_PTR)(a)) & 0xFFFF) | ((((UINT_PTR)(b)) & 0xFFFF) << 16)))