diff options
| author | Tom Yu <tlyu@mit.edu> | 2010-01-26 22:55:07 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2010-01-26 22:55:07 +0000 |
| commit | b3963547981b74413a6bafe1ae6c9c1c9e28416c (patch) | |
| tree | 8856d04a034d3ff6f2cfb42104cececb54b1569a | |
| parent | 4388630183fdc42b05958fa67fa26a80ffe0f2a5 (diff) | |
| download | krb5-b3963547981b74413a6bafe1ae6c9c1c9e28416c.tar.gz krb5-b3963547981b74413a6bafe1ae6c9c1c9e28416c.tar.xz krb5-b3963547981b74413a6bafe1ae6c9c1c9e28416c.zip | |
define MIN() in lib/gssapi/krb5/prf.c
Apply patch from Doug Engert to define MIN(), which was causing prf.c
to fail compilation on Solaris. (The definition was probably leaking
from sys/param.h, included indirectly somehow.)
ticket: 6648
target_version: 1.8
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23673 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/gssapi/krb5/prf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/gssapi/krb5/prf.c b/src/lib/gssapi/krb5/prf.c index f87c6b0c1..79e2d8759 100644 --- a/src/lib/gssapi/krb5/prf.c +++ b/src/lib/gssapi/krb5/prf.c @@ -32,6 +32,10 @@ #include "gssapiP_krb5.h" #include <stdarg.h> +#ifndef MIN /* Usually found in <sys/param.h>. */ +#define MIN(_a,_b) ((_a)<(_b)?(_a):(_b)) +#endif + OM_uint32 krb5_gss_pseudo_random(OM_uint32 *minor_status, gss_ctx_id_t context, |