* Tell doxygen to expand __class and __extern before parsing anything, so

we don’t end with those ugly identifiers in the documentation.

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 */

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 */

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

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;

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