From b4bcbf61b0745f9c3bfe7094f16c2627cd2ca93e Mon Sep 17 00:00:00 2001 From: byx0010 Date: Mon, 17 Jul 2023 18:14:12 +0800 Subject: [PATCH] fix:Add judgment to assign values to macro variable to adapt to PC Signed-off-by: byx0010 --- adapter/uhdf2/host/src/driver_loader_full.c | 4 ---- framework/core/host/src/hdf_load_vdi.c | 4 ---- interfaces/inner_api/utils/hdf_base.h | 4 ++++ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/adapter/uhdf2/host/src/driver_loader_full.c b/adapter/uhdf2/host/src/driver_loader_full.c index 6632c4bb2..7e526f13d 100644 --- a/adapter/uhdf2/host/src/driver_loader_full.c +++ b/adapter/uhdf2/host/src/driver_loader_full.c @@ -27,11 +27,7 @@ #define DRIVER_DESC "driverDesc" #define HDF_LOG_TAG driver_loader_full -#ifdef __ARCH64__ -#define DRIVER_PATH HDF_LIBRARY_DIR"64/" -#else #define DRIVER_PATH HDF_LIBRARY_DIR"/" -#endif static struct DriverLoaderFull *g_fullLoader = NULL; diff --git a/framework/core/host/src/hdf_load_vdi.c b/framework/core/host/src/hdf_load_vdi.c index b5c9c79c0..86f6a4bf2 100644 --- a/framework/core/host/src/hdf_load_vdi.c +++ b/framework/core/host/src/hdf_load_vdi.c @@ -15,11 +15,7 @@ #define HDF_LOG_TAG dev_load_vdi -#ifdef __ARCH64__ -#define VDI_PATH HDF_LIBRARY_DIR"64/" -#else #define VDI_PATH HDF_LIBRARY_DIR"/" -#endif struct HdfVdiObject *HdfLoadVdi(const char *libName) { diff --git a/interfaces/inner_api/utils/hdf_base.h b/interfaces/inner_api/utils/hdf_base.h index 2e8405334..59fdd6641 100644 --- a/interfaces/inner_api/utils/hdf_base.h +++ b/interfaces/inner_api/utils/hdf_base.h @@ -134,7 +134,11 @@ typedef enum { /** * @brief Declares the directory of the HDF module library. */ +#ifdef __aarch64__ +#define HDF_LIBRARY_DIR "/vendor/lib64" +#else #define HDF_LIBRARY_DIR "/vendor/lib" +#endif /** * @brief Declares the directory of the HDF module configuration files. -- Gitee