Link to, and adjust types for, the PCSC framework included with OSX

[mech_eap.git] / wpa_supplicant / ctrl_iface_named_pipe.c

diff --git a/wpa_supplicant/ctrl_iface_named_pipe.c b/wpa_supplicant/ctrl_iface_named_pipe.c
index af451eb..54e0e2f 100644 (file)
--- a/wpa_supplicant/ctrl_iface_named_pipe.c
+++ b/wpa_supplicant/ctrl_iface_named_pipe.c
@@ -2,14 +2,8 @@
  * WPA Supplicant / Windows Named Pipe -based control interface
  * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #include "includes.h"
@@ -20,7 +14,7 @@
 #include "eapol_supp/eapol_supp_sm.h"
 #include "wpa_supplicant_i.h"
 #include "ctrl_iface.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 
 #ifdef __MINGW32_VERSION
 /* mingw-w32api v3.1 does not yet include sddl.h, so define needed parts here
@@ -412,7 +406,8 @@ static int ctrl_iface_parse(struct ctrl_iface_priv *priv, const char *params)
                return -1;
        if (!ConvertStringSecurityDescriptorToSecurityDescriptor(
                    t_sddl, SDDL_REVISION_1,
-                   (PSECURITY_DESCRIPTOR *) &priv->attr.lpSecurityDescriptor,
+                   (PSECURITY_DESCRIPTOR *) (void *)
+                   &priv->attr.lpSecurityDescriptor,
                    NULL)) {
                os_free(t_sddl);
                wpa_printf(MSG_ERROR, "CTRL: SDDL='%s' - could not convert to "
@@ -429,6 +424,7 @@ static int ctrl_iface_parse(struct ctrl_iface_priv *priv, const char *params)
 
 
 static void wpa_supplicant_ctrl_iface_msg_cb(void *ctx, int level,
+                                            enum wpa_msg_type type,
                                             const char *txt, size_t len)
 {
        struct wpa_supplicant *wpa_s = ctx;