Mark MIN and MAX as macros as they have side effects.

diff --git a/cap.c b/cap.c
index ad7db89..d07bf9c 100644 (file)
--- a/cap.c
+++ b/cap.c
@@ -104,7 +104,7 @@ cap_init(const char *device, const char *filter, int promisc)
     *
     * Hack to set minimum snaplen to tcpdump's default:
     */
-   snaplen = max(snaplen, 96);
+   snaplen = MAX(snaplen, 96);
 #endif
    if (opt_want_snaplen > -1)
       snaplen = opt_want_snaplen;
@@ -218,7 +218,7 @@ cap_fd_set(
 #else
    /* We have a BSD-like BPF, we can select() on it. */
    FD_SET(pcap_fd, read_set);
-   *max_fd = max(*max_fd, pcap_fd);
+   *max_fd = MAX(*max_fd, pcap_fd);
 #endif
 }
 

diff --git a/cdefs.h b/cdefs.h
index 5a515e5..a0405eb 100644 (file)
--- a/cdefs.h
+++ b/cdefs.h
@@ -29,12 +29,12 @@
 #define restrict __restrict
 #endif
 
-#ifndef max
-# define max(a,b) ((a) > (b) ? (a) : (b))
+#ifndef MAX
+# define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
 
-#ifndef min
-# define min(a,b) ((a) < (b) ? (a) : (b))
+#ifndef MIN
+# define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
 /* vim:set ts=3 sw=3 tw=78 expandtab: */

diff --git a/decode.c b/decode.c
index fbc974a..9c35eb1 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -127,7 +127,7 @@ getlinkhdr(const int linktype)
 int
 getsnaplen(const struct linkhdr *lh)
 {
-   return (int)(lh->hdrlen + IPV6_HDR_LEN + max(TCP_HDR_LEN, UDP_HDR_LEN));
+   return (int)(lh->hdrlen + IPV6_HDR_LEN + MAX(TCP_HDR_LEN, UDP_HDR_LEN));
 }
 
 /* Decoding functions. */

diff --git a/hosts_db.c b/hosts_db.c
index 95f7738..f2129f0 100644 (file)
--- a/hosts_db.c
+++ b/hosts_db.c
@@ -914,7 +914,7 @@ format_table(struct str *buf, struct hashtable *ht, unsigned int start,
       start = 0;
       end = ht->count;
    } else
-      end = min(ht->count, (uint32_t)start+MAX_ENTRIES);
+      end = MIN(ht->count, (uint32_t)start+MAX_ENTRIES);
 
    str_appendf(buf, "(%u-%u of %u)<br>\n", start+1, end, ht->count);
    qsort_buckets(table, ht->count, start, end, sort);

diff --git a/hosts_sort.c b/hosts_sort.c
index 105922b..5757aa5 100644 (file)
--- a/hosts_sort.c
+++ b/hosts_sort.c
@@ -183,9 +183,9 @@ loop:
        }
 
        pn = a + n;
-       r = min(pa - a, pb - pa);
+       r = MIN(pa - a, pb - pa);
        vecswap(a, pb - r, r);
-       r = min(pd - pc, pn - pd - 1);
+       r = MIN(pd - pc, pn - pd - 1);
        vecswap(pb, pn - r, r);
        if (((r = pb - pa) > 1) && ((unsigned)r >= left))
                qsort_buckets(a, r, left, right, dir);

diff --git a/http.c b/http.c
index 5fc98fc..0707ccd 100644 (file)
--- a/http.c
+++ b/http.c
@@ -50,10 +50,6 @@ static int idletime = 60;
 static int *insocks = NULL;
 static unsigned int insock_num = 0;
 
-#ifndef min
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
 struct connection {
     LIST_ENTRY(connection) entries;
 
@@ -1002,7 +998,7 @@ http_fd_set(fd_set *recv_set, fd_set *send_set, int *max_fd,
     unsigned int i;
 
     #define MAX_FD_SET(sock, fdset) do { \
-        FD_SET(sock, fdset); *max_fd = max(*max_fd, sock); } while(0)
+        FD_SET(sock, fdset); *max_fd = MAX(*max_fd, sock); } while(0)
 
     for (i=0; i<insock_num; i++)
         MAX_FD_SET(insocks[i], recv_set);
@@ -1029,7 +1025,7 @@ http_fd_set(fd_set *recv_set, fd_set *send_set, int *max_fd,
 
         /* Connections that need a timeout. */
         if (conn->state != DONE)
-            minidle = min(minidle, (idletime - idlefor));
+            minidle = MIN(minidle, (idletime - idlefor));
 
         switch (conn->state)
         {