Changes testing for WIN32 to HAVE_*_H macros, changed how inline is defined on Windows

[moonshot.git] / moonshot / mech_eap / util.h

diff --git a/moonshot/mech_eap/util.h b/moonshot/mech_eap/util.h
index b3399be..61635bf 100644 (file)
--- a/moonshot/mech_eap/util.h
+++ b/moonshot/mech_eap/util.h
@@ -61,12 +61,29 @@
 #ifndef _UTIL_H_
 #define _UTIL_H_ 1
 
+#if defined(HAVE_SYS_PARAM_H)
 #include <sys/param.h>
+#endif
 #include <string.h>
 #include <errno.h>
 
 #include <krb5.h>
 
+///#if defined(HAVE_STDINT_H)
+///#include <stdint.h>
+///#endif
+
+///#if defined(WIN32)
+///#define INLINE  __inline
+///#else
+///#define INLINE      inline
+///#endif
+
+#if defined(WIN32)
+#define inline  __inline
+#endif
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -222,6 +239,14 @@ gssEapAcquireCred(OM_uint32 *minor,
 
 int gssEapCredAvailable(gss_cred_id_t cred, gss_OID mech);
 
+OM_uint32
+gssEapInquireCred(OM_uint32 *minor,
+                  gss_cred_id_t cred,
+                  gss_name_t *name,
+                  OM_uint32 *pLifetime,
+                  gss_cred_usage_t *cred_usage,
+                  gss_OID_set *mechanisms);
+
 /* util_crypt.c */
 int
 gssEapEncrypt(krb5_context context, int dce_style, size_t ec,
@@ -843,8 +868,10 @@ gssBufferToKrbData(gss_buffer_t buffer, krb5_data *data)
 }
 #endif
 
+#ifdef GSSEAP_ENABLE_ACCEPTOR
 #include "util_json.h"
 #include "util_attr.h"
+#endif
 #include "util_base64.h"
 #ifdef GSSEAP_ENABLE_REAUTH
 #include "util_reauth.h"