From d0d091ae080cbf15b2eea0c46327c073ef8afeb6 Mon Sep 17 00:00:00 2001 From: David O'Brien Date: Tue, 23 Apr 2002 02:04:20 +0000 Subject: encoding.c (MAX, [...]): #undef before defining. 2002-04-19 David O'Brien * encoding.c (MAX, MIN, ROUNDING): #undef before defining. Approved by: David S. Miller Message-Id: <20020419.184825.67430590.davem@redhat.com> From-SVN: r52648 --- libobjc/ChangeLog | 4 ++++ libobjc/encoding.c | 3 +++ 2 files changed, 7 insertions(+) (limited to 'libobjc') diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index eca6974..767e12f 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,7 @@ +2002-04-19 David O'Brien + + * encoding.c (MAX, MIN, ROUNDING): #undef before defining. + 2002-04-09 Hans-Peter Nilsson PR objc/6107 diff --git a/libobjc/encoding.c b/libobjc/encoding.c index ec71737..3927723 100644 --- a/libobjc/encoding.c +++ b/libobjc/encoding.c @@ -30,14 +30,17 @@ Boston, MA 02111-1307, USA. */ #include "objc-api.h" #include "encoding.h" +#undef MAX #define MAX(X, Y) \ ({ typeof(X) __x = (X), __y = (Y); \ (__x > __y ? __x : __y); }) +#undef MIN #define MIN(X, Y) \ ({ typeof(X) __x = (X), __y = (Y); \ (__x < __y ? __x : __y); }) +#undef ROUND #define ROUND(V, A) \ ({ typeof(V) __v=(V); typeof(A) __a=(A); \ __a*((__v+__a-1)/__a); }) -- cgit v1.1