deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bugfix: backwards definition of MIN macro (quite embarassing)

Browse source
This commit is contained in:
adamdunkels 2009-03-02 11:22:09 +00:00
parent b98c18e616
commit 45e32894a0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/rime/ipolite.c
View file

@ -33,7 +33,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: ipolite.c,v 1.12 2009/02/11 11:08:56 adamdunkels Exp $
* $Id: ipolite.c,v 1.13 2009/03/02 11:22:09 adamdunkels Exp $
*/
/**
@ -54,7 +54,7 @@
#endif /* MAX */
#ifndef MIN
#define MIN(a, b) ((a) > (b)? (a) : (b))
#define MIN(a, b) ((a) < (b)? (a) : (b))
#endif /* MIN */
#define DEBUG 0

6
core/net/rime/polite.c
View file

@ -33,7 +33,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: polite.c,v 1.7 2009/02/11 11:08:56 adamdunkels Exp $
* $Id: polite.c,v 1.8 2009/03/02 11:22:09 adamdunkels Exp $
*/
/**
@ -50,11 +50,11 @@
#include <string.h>
#ifndef MAX
#define MAX(a,b) ((a)>(b)?(a):(b))
#define MAX(a,b) ((a) > (b)? (a) : (b))
#endif /* MAX */
#ifndef MIN
#define MIN(a, b) ((a) > (b)? (a) : (b))
#define MIN(a, b) ((a) < (b)? (a) : (b))
#endif /* MIN */