From 94d95639c124ebff02a9944237ca9c1764c9cca9 Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Wed, 9 May 2012 15:09:52 -0400
Subject: Change __DOXYGEN_PREDEFINED_HACK to __DOXYGEN__.

avr-gcc does it this way. Seems ok to me.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
---
 libmaple/include/libmaple/stm32.h       | 7 +++----
 libmaple/stm32f1/include/series/stm32.h | 4 ++--
 support/doxygen/Doxyfile                | 2 +-
 3 files changed, 6 insertions(+), 7 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
 }
diff --git a/support/doxygen/Doxyfile b/support/doxygen/Doxyfile
index 5a5d7ed..a267c36 100644
--- a/support/doxygen/Doxyfile
+++ b/support/doxygen/Doxyfile
@@ -1377,7 +1377,7 @@ PREDEFINED             = __attribute__()= \
                        STM32_MEDIUM_DENSITY \
                        STM32_HIGH_DENSITY \
                        STM32_XL_DENSITY \
-                       __DOXYGEN_PREDEFINED_HACK
+                       __DOXYGEN__
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
-- 
cgit v1.2.3