diff --git a/src/daemon/https/tls/gnutls_int.h b/src/daemon/https/tls/gnutls_int.h index 80ee3467..25a861ed 100644 --- 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 index 68a6ce89..9a01d95b 100644 --- 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"