[GNUnet-SVN] r6440 - in GNUnet/src: include util/network

[gnunet]

Author: durner
Date: 2008-02-24 12:42:11 -0700 (Sun, 24 Feb 2008)
New Revision: 6440

Modified:
   GNUnet/src/include/gnunet_util.h
   GNUnet/src/util/network/select.c
Log:
GNUNET_MIN

Modified: GNUnet/src/include/gnunet_util.h
===================================================================
--- GNUnet/src/include/gnunet_util.h    2008-02-24 16:16:07 UTC (rev 6439)
+++ GNUnet/src/include/gnunet_util.h    2008-02-24 19:42:11 UTC (rev 6440)
@@ -70,14 +70,9 @@
 #endif
 #endif
 
-#ifndef MIN
-#define MIN(x,y) ((x) < (y) ? (x) : (y))
-#endif
+#define GNUNET_MIN(x,y) ((x) < (y) ? (x) : (y))
+#define GNUNET_MAX(x,y) ((x) > (y) ? (x) : (y))
 
-#ifndef MAX
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
-#endif
-
 /**
  * Just the version number of GNUnet-util implementation.
  * Encoded as

Modified: GNUnet/src/util/network/select.c
===================================================================
--- GNUnet/src/util/network/select.c    2008-02-24 16:16:07 UTC (rev 6439)
+++ GNUnet/src/util/network/select.c    2008-02-24 19:42:11 UTC (rev 6440)
@@ -533,7 +533,7 @@
                 timeout = 0;
               else
                 timeout =
-                  MIN (timeout, session->lastUse + session->timeout - now);
+                  GNUNET_MIN (timeout, session->lastUse + session->timeout - 
now);
             }
         }
       GNUNET_mutex_unlock (sh->lock);