From 12a3e80e763949b8b9b96263ca32d2ff45127d07 Mon Sep 17 00:00:00 2001 From: Kevin Wasserman Date: Tue, 21 Jun 2011 10:00:06 -0400 Subject: [PATCH] Other Windows changes and debug comments This patch is fixing remaining compilation errors. It also emphasizes other things that need fixing on Windows. --- moonshot/mech_eap/gssapiP_eap.h | 7 +++++++ moonshot/mech_eap/util_radius.h | 1 + moonshot/mech_eap/win32/config.h | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/moonshot/mech_eap/gssapiP_eap.h b/moonshot/mech_eap/gssapiP_eap.h index e843696..956fc3b 100644 --- a/moonshot/mech_eap/gssapiP_eap.h +++ b/moonshot/mech_eap/gssapiP_eap.h @@ -85,6 +85,13 @@ extern "C" { #endif #include #include + +////Because freeradius/autoconf.h is evil! +////#undef uint16_t +////#undef uint32_t +////#undef uint8_t +#undef pid_t + #include #include #ifdef __cplusplus diff --git a/moonshot/mech_eap/util_radius.h b/moonshot/mech_eap/util_radius.h index 04e6fc5..82d12cb 100644 --- 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 --- 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 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/" -- 2.1.4