aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2012-05-09 15:09:52 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2012-05-09 15:09:52 -0400
commit94d95639c124ebff02a9944237ca9c1764c9cca9 (patch)
tree6077f7cf099739fe9c7931d6dea9a0fb95952d94 /libmaple
parent392d791b26de9f77170332abab57c6542a4ced79 (diff)
downloadlibrambutan-94d95639c124ebff02a9944237ca9c1764c9cca9.tar.gz
librambutan-94d95639c124ebff02a9944237ca9c1764c9cca9.zip
Change __DOXYGEN_PREDEFINED_HACK to __DOXYGEN__.
avr-gcc does it this way. Seems ok to me. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'libmaple')
-rw-r--r--libmaple/include/libmaple/stm32.h7
-rw-r--r--libmaple/stm32f1/include/series/stm32.h4
2 files changed, 5 insertions, 6 deletions
diff --git a/libmaple/include/libmaple/stm32.h b/libmaple/include/libmaple/stm32.h
index 6b8e905..097a016 100644
--- a/libmaple/include/libmaple/stm32.h
+++ b/libmaple/include/libmaple/stm32.h
@@ -59,8 +59,7 @@ extern "C" {
/* The series header is responsible for defining:
*
- * - Everything enclosed in the following __DOXYGEN_PREDEFINED_HACK
- * conditional block.
+ * - Everything in the following __DOXYGEN__ conditional block.
*
* - STM32_HAVE_FSMC: 1 if the MCU has the FSMC peripheral, and 0
* otherwise.
@@ -79,7 +78,7 @@ extern "C" {
#error "Bad STM32F1 configuration. Check <series/stm32.h> header for your MCU."
#endif
-#ifdef __DOXYGEN_PREDEFINED_HACK
+#ifdef __DOXYGEN__
/*
* Clock configuration.
@@ -162,7 +161,7 @@ extern "C" {
*/
#define STM32_HAVE_USB
-#endif /* __DOXYGEN_PREDEFINED_HACK */
+#endif /* __DOXYGEN__ */
/*
* The following are for backwards compatibility only.
diff --git a/libmaple/stm32f1/include/series/stm32.h b/libmaple/stm32f1/include/series/stm32.h
index e6d3b19..e01c494 100644
--- a/libmaple/stm32f1/include/series/stm32.h
+++ b/libmaple/stm32f1/include/series/stm32.h
@@ -181,7 +181,7 @@ extern "C" {
* Doxygen
*/
-#ifdef __DOXYGEN_PREDEFINED_HACK
+#ifdef __DOXYGEN__
/**
* @brief STM32 line value for the STM32F1 MCU being targeted.
@@ -192,7 +192,7 @@ extern "C" {
*/
#define STM32_F1_LINE
-#endif /* __DOXYGEN_PREDEFINED_HACK */
+#endif /* __DOXYGEN__ */
#ifdef __cplusplus
}