X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=wpa_supplicant%2Fbinder%2Fsupplicant.h;fp=wpa_supplicant%2Fbinder%2Fsupplicant.h;h=136b99b1432749d08edd4fbe22852da74e8a3109;hb=a1979469fd13dd39201362fa953fcb3087d7a17b;hp=b96f4e6a019b97bc60ff0f5f67b3fb168cec591c;hpb=fe1d0771f72e6be7e81d46658dcac37a3629c317;p=mech_eap.git diff --git a/wpa_supplicant/binder/supplicant.h b/wpa_supplicant/binder/supplicant.h index b96f4e6..136b99b 100644 --- a/wpa_supplicant/binder/supplicant.h +++ b/wpa_supplicant/binder/supplicant.h @@ -7,16 +7,16 @@ * See README for more details. */ -#ifndef SUPPLICANT_H -#define SUPPLICANT_H +#ifndef WPA_SUPPLICANT_BINDER_SUPPLICANT_H +#define WPA_SUPPLICANT_BINDER_SUPPLICANT_H #include "fi/w1/wpa_supplicant/BnSupplicant.h" #include "fi/w1/wpa_supplicant/IIface.h" #include "fi/w1/wpa_supplicant/ISupplicantCallbacks.h" extern "C" { -#include "utils/includes.h" #include "utils/common.h" +#include "utils/includes.h" #include "../wpa_supplicant_i.h" } @@ -34,24 +34,22 @@ public: virtual ~Supplicant() = default; android::binder::Status CreateInterface( - const android::os::PersistableBundle ¶ms, - android::sp *aidl_return) - override; - android::binder::Status RemoveInterface( - const std::string &ifname) override; + const android::os::PersistableBundle ¶ms, + android::sp *aidl_return) override; + android::binder::Status + RemoveInterface(const std::string &ifname) override; android::binder::Status GetInterface( - const std::string &ifname, - android::sp *aidl_return) - override; + const std::string &ifname, + android::sp *aidl_return) override; private: /* Raw pointer to the global structure maintained by the core. */ struct wpa_global *wpa_global_; /* All the callback objects registered by the clients. */ std::vector> - callbacks_; + callbacks_; }; } /* namespace wpa_supplicant_binder */ -#endif /* SUPPLICANT_H */ +#endif /* WPA_SUPPLICANT_BINDER_SUPPLICANT_H */