From 6479a626381b590c8523ede31926d2e9ed985ed0 Mon Sep 17 00:00:00 2001 From: Zaoqi Date: Sun, 15 Dec 2019 15:49:52 +0800 Subject: [PATCH 1/4] fix build issue on Alpinelinux --- src/libappimage/utils/light_elf.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libappimage/utils/light_elf.h b/src/libappimage/utils/light_elf.h index d6044a71..11003012 100644 --- a/src/libappimage/utils/light_elf.h +++ b/src/libappimage/utils/light_elf.h @@ -26,7 +26,9 @@ #include -__BEGIN_DECLS +#ifdef _cplusplus +extern "C" { +#endif typedef uint16_t Elf32_Half; typedef uint16_t Elf64_Half; @@ -114,6 +116,8 @@ typedef struct elf32_note { #define EI_CLASS 4 #define EI_DATA 5 -__END_DECLS +#ifdef _cplusplus +} +#endif #endif /* elf.h */ From 8e2336fff07ee664700e3e487faf0eb3ca365573 Mon Sep 17 00:00:00 2001 From: Zaoqi Date: Sun, 15 Dec 2019 15:50:53 +0800 Subject: [PATCH 2/4] Update light_elf.h --- src/libappimage_shared/light_elf.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libappimage_shared/light_elf.h b/src/libappimage_shared/light_elf.h index d6044a71..11003012 100644 --- a/src/libappimage_shared/light_elf.h +++ b/src/libappimage_shared/light_elf.h @@ -26,7 +26,9 @@ #include -__BEGIN_DECLS +#ifdef _cplusplus +extern "C" { +#endif typedef uint16_t Elf32_Half; typedef uint16_t Elf64_Half; @@ -114,6 +116,8 @@ typedef struct elf32_note { #define EI_CLASS 4 #define EI_DATA 5 -__END_DECLS +#ifdef _cplusplus +} +#endif #endif /* elf.h */ From 0f1cae9beff78a66cdc728efffa6626ae7af3e14 Mon Sep 17 00:00:00 2001 From: Zaoqi Date: Fri, 20 Dec 2019 18:37:55 +0800 Subject: [PATCH 3/4] Update light_elf.h --- src/libappimage/utils/light_elf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libappimage/utils/light_elf.h b/src/libappimage/utils/light_elf.h index 11003012..f13b9817 100644 --- a/src/libappimage/utils/light_elf.h +++ b/src/libappimage/utils/light_elf.h @@ -26,7 +26,7 @@ #include -#ifdef _cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -116,7 +116,7 @@ typedef struct elf32_note { #define EI_CLASS 4 #define EI_DATA 5 -#ifdef _cplusplus +#ifdef __cplusplus } #endif From 3163105ff8d7e62ec9e11c832b57451e40fb6c5c Mon Sep 17 00:00:00 2001 From: Zaoqi Date: Fri, 20 Dec 2019 18:38:14 +0800 Subject: [PATCH 4/4] Update light_elf.h --- src/libappimage_shared/light_elf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libappimage_shared/light_elf.h b/src/libappimage_shared/light_elf.h index 11003012..f13b9817 100644 --- a/src/libappimage_shared/light_elf.h +++ b/src/libappimage_shared/light_elf.h @@ -26,7 +26,7 @@ #include -#ifdef _cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -116,7 +116,7 @@ typedef struct elf32_note { #define EI_CLASS 4 #define EI_DATA 5 -#ifdef _cplusplus +#ifdef __cplusplus } #endif