commit 5e1b980a962c8b83e1981c615e163f37251d345f
parent f9a75f648ab310db4ca3837510bf06b57fd3c989
Author: Heikki Lindholm <holin@iki.fi>
Date: Fri, 20 Feb 2009 10:35:43 +0000
kill compiler warnings
Diffstat:
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/daemon/https/tls/gnutls_int.h b/src/daemon/https/tls/gnutls_int.h
@@ -36,7 +36,9 @@
*/
#define KEYRING_HACK
+#ifndef MAX
#define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
+#endif
#define MAX32 4294967295
#define MAX24 16777215
diff --git a/src/daemon/https/x509/x509.h b/src/daemon/https/x509/x509.h
@@ -25,7 +25,9 @@
#ifndef X509_H
#define X509_H
+#ifndef MIN
#define MIN(X,Y) ((X) > (Y) ? (Y) : (X));
+#endif
#ifdef __cplusplus
extern "C"