diff options
| author | Heikki Lindholm <holin@iki.fi> | 2009-02-20 10:35:43 +0000 |
|---|---|---|
| committer | Heikki Lindholm <holin@iki.fi> | 2009-02-20 10:35:43 +0000 |
| commit | 5e1b980a962c8b83e1981c615e163f37251d345f (patch) | |
| tree | 36cecf4b7b56acc7f022ecaf2d13ca8c3c6017a4 | |
| parent | f9a75f648ab310db4ca3837510bf06b57fd3c989 (diff) | |
kill compiler warnings
| -rw-r--r-- | src/daemon/https/tls/gnutls_int.h | 2 | ||||
| -rw-r--r-- | src/daemon/https/x509/x509.h | 2 |
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 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" |