diff options
| author | red031000 <rubenru09@aol.com> | 2020-06-20 21:25:34 +0100 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 21:25:34 +0100 | 
| commit | 7e6562f747a773ef3ad764c6d0b6b1f2e7d6cfc6 (patch) | |
| tree | 24e1bb3e1a14991110255665aee09957c9306a0f /tools | |
| parent | 863b09f18dca59864a95cc72afdaac9b13332d13 (diff) | |
| parent | e9e192ce20e2f863a836c3ee9ab364921d068116 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/o2narc/elf.h | 14 | 
1 files changed, 5 insertions, 9 deletions
| diff --git a/tools/o2narc/elf.h b/tools/o2narc/elf.h index ad47e94e..c5f9f279 100644 --- a/tools/o2narc/elf.h +++ b/tools/o2narc/elf.h @@ -1,15 +1,13 @@  #ifndef _ELF_H  #define	_ELF_H 1 -#ifdef __cplusplus -extern "C" { -#endif -  /* Standard ELF types.  */  #include <inttypes.h> -__BEGIN_DECLS +#ifdef __cplusplus +extern "C" { +#endif  /* Type for a 16-bit quantity.  */  typedef uint16_t Elf32_Half; @@ -2425,10 +2423,8 @@ typedef Elf32_Addr Elf32_Conflict;  #define R_X86_64_NUM        24 -__END_DECLS -  #ifdef __cplusplus  }; -#endif //__cplusplus +#endif -#endif	/* elf.h */
\ No newline at end of file +#endif	/* elf.h */ | 
