From 069f4775f0e23e907f2cfcce4f9755635933502f Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 26 Nov 2007 01:04:21 +0000
Subject: [PATCH] =?UTF-8?q?=20=20*=20Tell=20doxygen=20to=20expand=20=5F=5F?=
 =?UTF-8?q?class=20and=20=5F=5Fextern=20before=20parsing=20anything,=20so?=
 =?UTF-8?q?=20=20=20=20=20we=20don=E2=80=99t=20end=20with=20those=20ugly?=
 =?UTF-8?q?=20identifiers=20in=20the=20documentation.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 caca/caca.h        | 12 +++++-------
 cucul/cucul.h      | 12 +++++-------
 cxx/caca++.h       | 12 +++++-------
 cxx/cucul++.h      | 12 +++++-------
 doc/doxygen.cfg.in |  6 +++---
 5 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/caca/caca.h b/caca/caca.h
index 1486c75..facd211 100644
--- a/caca/caca.h
+++ b/caca/caca.h
@@ -26,13 +26,11 @@
 
 #include <cucul.h>
 
-#if !defined(_DOXYGEN_SKIP_ME)
-#   undef __extern
-#   if defined(_WIN32) && defined(__LIBCACA__)
-#       define __extern extern __declspec(dllexport)
-#   else
-#       define __extern extern
-#   endif
+#undef __extern
+#if defined(_WIN32) && defined(__LIBCACA__)
+#   define __extern extern __declspec(dllexport)
+#else
+#   define __extern extern
 #endif
 
 /** libcaca API version */
diff --git a/cucul/cucul.h b/cucul/cucul.h
index 19a4504..f9ab032 100644
--- a/cucul/cucul.h
+++ b/cucul/cucul.h
@@ -24,13 +24,11 @@
 #ifndef __CUCUL_H__
 #define __CUCUL_H__
 
-#if !defined(_DOXYGEN_SKIP_ME)
-#   undef __extern
-#   if defined(_WIN32) && defined(__LIBCUCUL__)
-#       define __extern extern __declspec(dllexport)
-#   else
-#       define __extern extern
-#   endif
+#undef __extern
+#if defined(_WIN32) && defined(__LIBCUCUL__)
+#   define __extern extern __declspec(dllexport)
+#else
+#   define __extern extern
 #endif
 
 /** libcucul API version */
diff --git a/cxx/caca++.h b/cxx/caca++.h
index 3e98d90..10cc83d 100644
--- a/cxx/caca++.h
+++ b/cxx/caca++.h
@@ -28,13 +28,11 @@
 
 #include <cucul++.h>
 
-#if !defined(_DOXYGEN_SKIP_ME)
-#   undef __class
-#   if defined(_WIN32) && defined(__LIBCACA_PP__)
-#       define __class class __declspec(dllexport)
-#   else
-#       define __class class
-#   endif
+#undef __class
+#if defined(_WIN32) && defined(__LIBCACA_PP__)
+#   define __class class __declspec(dllexport)
+#else
+#   define __class class
 #endif
 
 __class Event
diff --git a/cxx/cucul++.h b/cxx/cucul++.h
index 408cb05..a3be116 100644
--- a/cxx/cucul++.h
+++ b/cxx/cucul++.h
@@ -26,13 +26,11 @@
 
 #include <cucul.h>
 
-#if !defined(_DOXYGEN_SKIP_ME)
-#   undef __class
-#   if defined(_WIN32) && defined(__LIBCUCUL_PP__)
-#       define __class class __declspec(dllexport)
-#   else
-#       define __class class
-#   endif
+#undef __class
+#if defined(_WIN32) && defined(__LIBCUCUL_PP__)
+#   define __class class __declspec(dllexport)
+#else
+#   define __class class
 #endif
 
 class Cucul;
diff --git a/doc/doxygen.cfg.in b/doc/doxygen.cfg.in
index 6e8424d..c8b4c5a 100644
--- a/doc/doxygen.cfg.in
+++ b/doc/doxygen.cfg.in
@@ -1039,13 +1039,13 @@ ENABLE_PREPROCESSING   = YES
 # compilation will be performed. Macro expansion can be done in a controlled 
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
 # then the macro expansion is limited to the macros specified with the 
 # PREDEFINED and EXPAND_AS_DEFINED tags.
 
-EXPAND_ONLY_PREDEF     = NO
+EXPAND_ONLY_PREDEF     = YES
 
 # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
 # in the INCLUDE_PATH (see below) will be search if a #include is found.
@@ -1080,7 +1080,7 @@ PREDEFINED             = _DOXYGEN_SKIP_ME
 # The macro definition that is found in the sources will be used. 
 # Use the PREDEFINED tag if you want to use a different macro definition.
 
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      = __extern __class
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
 # doxygen's preprocessor will remove all function-like macros that are alone