diff --git a/include/syscap_define.h b/include/syscap_define.h index 2c5f4828342556cc9cd8eb3032acea610cefe7f6..1c0775eb33c220ffe323eb8d6b943a45ca21bd9e 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -19,14 +19,18 @@ #include #define SINGLE_SYSCAP_LEN (256 + 17) - +#ifdef __cplusplus +#if __cplusplus +extern "C" { +#endif /* __cplusplus */ +#endif /* __cplusplus */ typedef struct SystemCapabilityWithNum { char str[SINGLE_SYSCAP_LEN]; uint16_t num; } SyscapWithNum; /* - * New syscap index must be added last and + * New SyscapNum must be added last and * don't delete anyone, just comment after it. */ typedef enum SystemCapabilityNum { @@ -216,7 +220,7 @@ typedef enum SystemCapabilityNum { } SyscapNum; -/* sort by enum */ +/* Sort by SyscapNum */ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Account.AppAccount", ACCOUNT_APPACCOUNT}, {"SystemCapability.Account.OsAccount", ACCOUNT_OSACCOUNT}, @@ -401,4 +405,9 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Utils.Lang", UTILS_LANG}, }; +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ #endif // _SYSCAP_DEFINE_H diff --git a/interfaces/inner_api/syscap_interface.c b/interfaces/inner_api/syscap_interface.c index b55f3563ad2e377a2f7d8ae07b65751855e8def7..6010d1fffde3d1cbfb0794cd2cdeab885bae3261 100644 --- a/interfaces/inner_api/syscap_interface.c +++ b/interfaces/inner_api/syscap_interface.c @@ -183,7 +183,7 @@ bool EncodePrivateSyscap(char **output, int *outputLen) } FreeContextBuffer(contextBuffer); - *outputLen = strlen(outputStr); + *outputLen = (int)strlen(outputStr); *output = outputStr; return true; }