jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dbus: Remove unnecessary CONFIG_WPS ifdefs from header files

Browse source
This commit is contained in:
Jouni Malinen 2009-12-20 20:40:23 +02:00
parent eb3b34ceea
commit a8c481c10a
4 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wpa_supplicant/dbus/ctrl_iface_dbus.h
View file

@ -74,14 +74,12 @@ struct wps_credential;
#define WPAS_ERROR_REMOVE_NETWORK_ERROR \ #define WPAS_ERROR_REMOVE_NETWORK_ERROR \
WPAS_DBUS_IFACE_INTERFACE ".RemoveNetworkError" WPAS_DBUS_IFACE_INTERFACE ".RemoveNetworkError"
#ifdef CONFIG_WPS
#define WPAS_ERROR_WPS_PBC_ERROR \ #define WPAS_ERROR_WPS_PBC_ERROR \
WPAS_DBUS_IFACE_INTERFACE ".WpsPbcError" WPAS_DBUS_IFACE_INTERFACE ".WpsPbcError"
#define WPAS_ERROR_WPS_PIN_ERROR \ #define WPAS_ERROR_WPS_PIN_ERROR \
WPAS_DBUS_IFACE_INTERFACE ".WpsPinError" WPAS_DBUS_IFACE_INTERFACE ".WpsPinError"
#define WPAS_ERROR_WPS_REG_ERROR \ #define WPAS_ERROR_WPS_REG_ERROR \
WPAS_DBUS_IFACE_INTERFACE ".WpsRegError" WPAS_DBUS_IFACE_INTERFACE ".WpsRegError"
#endif /* CONFIG_WPS */
#define WPAS_DBUS_BSSID_FORMAT "%02x%02x%02x%02x%02x%02x" #define WPAS_DBUS_BSSID_FORMAT "%02x%02x%02x%02x%02x%02x"

2
wpa_supplicant/dbus/ctrl_iface_dbus_handlers.h
View file

@ -86,7 +86,6 @@ DBusMessage * wpas_dbus_iface_set_blobs(DBusMessage *message,
DBusMessage * wpas_dbus_iface_remove_blobs(DBusMessage *message, DBusMessage * wpas_dbus_iface_remove_blobs(DBusMessage *message,
struct wpa_supplicant *wpa_s); struct wpa_supplicant *wpa_s);
#ifdef CONFIG_WPS
DBusMessage * wpas_dbus_iface_wps_pbc(DBusMessage *message, DBusMessage * wpas_dbus_iface_wps_pbc(DBusMessage *message,
struct wpa_supplicant *wpa_s); struct wpa_supplicant *wpa_s);
@ -95,7 +94,6 @@ DBusMessage * wpas_dbus_iface_wps_pin(DBusMessage *message,
DBusMessage * wpas_dbus_iface_wps_reg(DBusMessage *message, DBusMessage * wpas_dbus_iface_wps_reg(DBusMessage *message,
struct wpa_supplicant *wpa_s); struct wpa_supplicant *wpa_s);
#endif /* CONFIG_WPS */
#endif /* CONFIG_CTRL_IFACE_DBUS */ #endif /* CONFIG_CTRL_IFACE_DBUS */

2
wpa_supplicant/dbus/ctrl_iface_dbus_new.h
View file

@ -71,7 +71,6 @@ struct wpas_dbus_callbacks {
enum wpas_dbus_prop property); enum wpas_dbus_prop property);
void (*signal_debug_params_changed)(struct wpa_global *global); void (*signal_debug_params_changed)(struct wpa_global *global);
#ifdef CONFIG_WPS
void (*signal_wps_event_success)(struct wpa_supplicant *wpa_s); void (*signal_wps_event_success)(struct wpa_supplicant *wpa_s);
void (*signal_wps_event_fail)(struct wpa_supplicant *wpa_s, void (*signal_wps_event_fail)(struct wpa_supplicant *wpa_s,
struct wps_event_fail *fail); struct wps_event_fail *fail);
@ -79,7 +78,6 @@ struct wpas_dbus_callbacks {
struct wps_event_m2d *m2d); struct wps_event_m2d *m2d);
void (*signal_wps_credentials)(struct wpa_supplicant *wpa_s, void (*signal_wps_credentials)(struct wpa_supplicant *wpa_s,
const struct wps_credential *cred); const struct wps_credential *cred);
#endif /* CONFIG_WPS */
}; };

3
wpa_supplicant/dbus/ctrl_iface_dbus_new_handlers.h
View file

@ -124,8 +124,6 @@ DBusMessage * wpas_dbus_getter_network_properties(
DBusMessage * wpas_dbus_setter_network_properties( DBusMessage * wpas_dbus_setter_network_properties(
DBusMessage *message, struct network_handler_args *net); DBusMessage *message, struct network_handler_args *net);
#ifdef CONFIG_WPS
DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message, DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message,
struct wpa_supplicant *wpa_s); struct wpa_supplicant *wpa_s);
@ -137,6 +135,5 @@ DBusMessage * wpas_dbus_setter_process_credentials(
DBusMessage * wpas_dbus_getter_credentials(DBusMessage *message, DBusMessage * wpas_dbus_getter_credentials(DBusMessage *message,
struct wpa_supplicant *wpa_s); struct wpa_supplicant *wpa_s);
#endif /* CONFIG_WPS */
#endif /* CTRL_IFACE_DBUS_HANDLERS_NEW_H */ #endif /* CTRL_IFACE_DBUS_HANDLERS_NEW_H */