From Alexis La Goutte:

Replace all *_min()/*_max() by MIN() and MAX().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34770 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/wiretap/erf.c b/wiretap/erf.c
index ba31714f69e999404b4fc3df094aa765c0546e2f..1562fb3d7003a4e6e9235df305bcc017d6fa2da0 100644 (file)
--- a/wiretap/erf.c
+++ b/wiretap/erf.c
@@ -56,9 +56,6 @@
 #include "atm.h"
 #include "erf.h"
 
-#ifndef min
-#define min(a, b) ((a) > (b) ? (b) : (a))
-#endif
 
 static int erf_read_header(FILE_T fh,
                           struct wtap_pkthdr *phdr,
@@ -447,7 +444,7 @@ static int erf_read_header(FILE_T fh,
 
   if (phdr != NULL) {
     phdr->len = g_htons(erf_header->wlen);
-    phdr->caplen = min( g_htons(erf_header->wlen),
+    phdr->caplen = MIN( g_htons(erf_header->wlen),
                        g_htons(erf_header->rlen) - (guint32)sizeof(*erf_header) - skiplen );
   }
   return TRUE;

diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c
index 74cdeeda3b84115413514a0877606ff3679ad3a7..f3e756f4addf26f0e253f474c3e87504857b076c 100644 (file)
--- a/wiretap/netscaler.c
+++ b/wiretap/netscaler.c
@@ -30,10 +30,6 @@
 #include "buffer.h"
 #include "netscaler.h"
 
-/* Defines imported from netscaler code: nstypes.h */
-
-#define ns_min(a, b)   ((a<b)?a:b)
-
 /* Defines imported from netscaler code: nsperfrc.h */
 
 #define        NSPR_SIGSTR_V10 "NetScaler Performance Data"
@@ -574,7 +570,7 @@ nspm_signature_version(wtap *wth, gchar *nstrace_buf, gint32 len)
        bytes_read = file_read(dp, 1, len, wth->fh);
        if (bytes_read == len) {
 
-               for ( ; len > (gint32)(ns_min(sizeof(NSPR_SIGSTR_V10), sizeof(NSPR_SIGSTR_V20))); dp++, len--)
+               for ( ; len > (gint32)(MIN(sizeof(NSPR_SIGSTR_V10), sizeof(NSPR_SIGSTR_V20))); dp++, len--)
                {
 #define        sigv10p ((nspr_signature_v10_t*)dp)
                        if ((pletohs(&sigv10p->nsprRecordType) == NSPR_SIGNATURE_V10) &&