From 840dab8c47e847911a697a270014e7b204909d68 Mon Sep 17 00:00:00 2001
From: Anthony Merlino <anthony@vergeaero.com>
Date: Tue, 19 Feb 2019 15:24:25 +0000
Subject: [PATCH] Merged in antmerlino/nuttx/elf-cplusplus-guard (pull request
 #826)

include/nuttx/elf.h: Adds missing extern "C" __cplusplus guard.

Approved-by: GregoryN <gnutt@nuttx.org>
---
 include/nuttx/elf.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/include/nuttx/elf.h b/include/nuttx/elf.h
index dd89837e60..ae90c74db7 100644
--- a/include/nuttx/elf.h
+++ b/include/nuttx/elf.h
@@ -46,6 +46,11 @@
  * Public Function Prototypes
  ****************************************************************************/
 
+#if defined(__cplusplus)
+extern "C"
+{
+#endif
+
 /****************************************************************************
  * Name: up_checkarch
  *
@@ -115,4 +120,8 @@ int up_relocateadd(FAR const Elf32_Rela *rel,
 int up_init_exidx(Elf32_Addr address, Elf32_Word size);
 #endif
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* __INCLUDE_NUTTX_ELF_H */