aboutsummaryrefslogtreecommitdiff
path: root/src/modules/systemlib/up_cxxinitialize.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/systemlib/up_cxxinitialize.c')
-rw-r--r--src/modules/systemlib/up_cxxinitialize.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/modules/systemlib/up_cxxinitialize.c b/src/modules/systemlib/up_cxxinitialize.c
index c78f29570..4028945e5 100644
--- a/src/modules/systemlib/up_cxxinitialize.c
+++ b/src/modules/systemlib/up_cxxinitialize.c
@@ -1,8 +1,8 @@
/************************************************************************************
- * configs/stm32f4discovery/src/up_cxxinitialize.c
+ * src/modules/systemlib/up_cxxinitialize.c
* arch/arm/src/board/up_cxxinitialize.c
*
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -44,9 +44,10 @@
#include <nuttx/arch.h>
-//#include <arch/stm32/chip.h>
-//#include "chip.h"
+#include <arch/stm32/chip.h>
+#include "chip.h"
+#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
/************************************************************************************
* Definitions
************************************************************************************/
@@ -122,7 +123,7 @@ extern uint32_t _etext;
*
***************************************************************************/
-__EXPORT void up_cxxinitialize(void)
+void up_cxxinitialize(void)
{
initializer_t *initp;
@@ -148,3 +149,6 @@ __EXPORT void up_cxxinitialize(void)
}
}
}
+
+#endif /* CONFIG_HAVE_CXX && CONFIG_HAVE_CXXINITIALIZE */
+