diff --git a/frameworks/common/include/data_validator.h b/frameworks/common/include/data_validator.h index 8821598cf66fa638851a47fcb909188a09db5944..b966799691eb40f4bfe5487598e1893e5e5a01da 100644 --- a/frameworks/common/include/data_validator.h +++ b/frameworks/common/include/data_validator.h @@ -13,11 +13,12 @@ * limitations under the License. */ +#ifndef DATA_VALIDATOR_H +#define DATA_VALIDATOR_H + #include #include "access_token.h" -#ifndef DATA_VALIDATOR_H -#define DATA_VALIDATOR_H namespace OHOS { namespace Security { namespace AccessToken { diff --git a/frameworks/common/include/random.h b/frameworks/common/include/random.h index 9362764210314841612be570b5edb67170e0b3ad..278cc24aa06bd33d3ea74a46ca9245c4ceee1689 100644 --- a/frameworks/common/include/random.h +++ b/frameworks/common/include/random.h @@ -22,7 +22,7 @@ extern "C" { #endif #endif -unsigned int GetRandomUint32(); +unsigned int GetRandomUint32(void); #ifdef __cplusplus #if __cplusplus diff --git a/services/accesstokenmanager/main/cpp/include/token/native_token_info_inner.h b/services/accesstokenmanager/main/cpp/include/token/native_token_info_inner.h index 527d176d1a8f346e1a4e7b486f4a436f37585595..f76e1ba0537a310b46723005146d0f374ffb59a7 100644 --- a/services/accesstokenmanager/main/cpp/include/token/native_token_info_inner.h +++ b/services/accesstokenmanager/main/cpp/include/token/native_token_info_inner.h @@ -16,11 +16,11 @@ #ifndef ACCESSTOKEN_NATIVE_TOKEN_INFO_INNER_H #define ACCESSTOKEN_NATIVE_TOKEN_INFO_INNER_H -#include "access_token.h" -#include "native_token_info.h" #include #include +#include "access_token.h" #include "generic_values.h" +#include "native_token_info.h" namespace OHOS { namespace Security { diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp index 7bedb75559322bd9988fd1d0c96a7643f9e4a7cb..3d1421b82ccfb948e52e4701d5f0b410cf3192de 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp @@ -14,9 +14,6 @@ */ #include "accesstoken_id_manager.h" - -#include - #include "accesstoken_log.h" #include "data_validator.h" #include "random.h"