Skip to content

Commit ca52760

Browse files
author
oclyke
committed
Merge branch '2.5.1-patch-triple_read-cpp-guard-wrap' into 2.5.1-tflu
2 parents 87d7651 + 71b1c53 commit ca52760

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

mcu/apollo3/hal/am_hal_global.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,6 @@ extern volatile uint32_t g_ui32HALflags;
159159
extern const uint8_t g_ui8HALcompiler[];
160160
extern const am_hal_version_t g_ui32HALversion;
161161

162-
#ifdef __cplusplus
163-
}
164-
#endif
165-
166162
#if (defined (__ARMCC_VERSION)) && (__ARMCC_VERSION < 6000000)
167163
__asm void
168164
am_hal_triple_read( uint32_t u32TimerAddr, uint32_t ui32Data[]);
@@ -180,4 +176,8 @@ am_hal_triple_read( uint32_t u32TimerAddr, uint32_t ui32Data[]);
180176
#error Compiler is unknown, please contact Ambiq support team
181177
#endif
182178

179+
#ifdef __cplusplus
180+
}
181+
#endif
182+
183183
#endif // AM_HAL_GLOBAL_H

0 commit comments

Comments
 (0)