Other Windows changes and debug comments

This patch is fixing remaining compilation errors. It also emphasizes
other things that need fixing on Windows.

diff --git a/moonshot/mech_eap/gssapiP_eap.h b/moonshot/mech_eap/gssapiP_eap.h
index e843696..956fc3b 100644 (file)
--- a/moonshot/mech_eap/gssapiP_eap.h
+++ b/moonshot/mech_eap/gssapiP_eap.h
@@ -85,6 +85,13 @@ extern "C" {
 #endif
 #include <freeradius/libradius.h>
 #include <freeradius/radius.h>
+
+////Because freeradius/autoconf.h is evil!
+////#undef uint16_t
+////#undef uint32_t
+////#undef uint8_t
+#undef pid_t
+
 #include <radsec/radsec.h>
 #include <radsec/request.h>
 #ifdef __cplusplus

diff --git a/moonshot/mech_eap/util_radius.h b/moonshot/mech_eap/util_radius.h
index 04e6fc5..82d12cb 100644 (file)
--- a/moonshot/mech_eap/util_radius.h
+++ b/moonshot/mech_eap/util_radius.h
@@ -154,6 +154,7 @@ OM_uint32
 gssEapRadiusMapError(OM_uint32 *minor,
                      struct rs_error *err);
 
+////This really need to be a function call on Windows
 #define RS_CONFIG_FILE      SYSCONFDIR "/radsec.conf"
 
 #define VENDORPEC_MS                        311 /* RFC 2548 */

diff --git a/moonshot/mech_eap/win32/config.h b/moonshot/mech_eap/win32/config.h
index f28a0cf..efd99c9 100644 (file)
--- a/moonshot/mech_eap/win32/config.h
+++ b/moonshot/mech_eap/win32/config.h
@@ -47,6 +47,13 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 /* #undef HAVE_UNISTD_H */
 
+#define SYSCONFDIR  "c:\\Program Files\\Moonshot\\etc"
+
+////This messes up freeradius, if defined here
+///#if !defined(snprintf)
+///#define snprintf  _snprintf
+///#endif
+
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #define LT_OBJDIR ".libs/"