use shibresolver API properly

[mech_eap.orig] / util_attr.h

diff --git a/util_attr.h b/util_attr.h
index c846864..e2820c0 100644 (file)
--- a/util_attr.h
+++ b/util_attr.h
@@ -33,13 +33,6 @@
 #ifndef _UTIL_ATTR_H_
 #define _UTIL_ATTR_H_ 1
 
-#define ATTR_TYPE_RADIUS            0U
-#define ATTR_TYPE_SAML_ASSERTION    1U
-#define ATTR_TYPE_SAML              2U
-#define ATTR_TYPE_LOCAL             3U
-#define ATTR_TYPE_MIN               ATTR_TYPE_RADIUS
-#define ATTR_TYPE_MAX               ATTR_TYPE_LOCAL
-
 #ifdef __cplusplus
 #include <string>
 
@@ -51,6 +44,13 @@ typedef bool
                                const gss_buffer_t attribute,
                                void *data);
 
+#define ATTR_TYPE_RADIUS            0U
+#define ATTR_TYPE_SAML_ASSERTION    1U
+#define ATTR_TYPE_SAML              2U
+#define ATTR_TYPE_LOCAL             3U
+#define ATTR_TYPE_MIN               ATTR_TYPE_RADIUS
+#define ATTR_TYPE_MAX               ATTR_TYPE_LOCAL
+
 /*
  * Attribute provider: this represents a source of attributes derived
  * from the security context.
@@ -213,10 +213,14 @@ private:
     gss_eap_attr_provider *m_providers[ATTR_TYPE_MAX + 1];
 };
 
+#endif /* __cplusplus */
+
 #include "util_radius.h"
 #include "util_saml.h"
 #include "util_shib.h"
 
+#ifdef __cplusplus
+
 #include <string>
 #include <new>