Rebalance our exposed headers such that everything is nested properly

  between extern "C" blocks and doxygen blocks, that we never include
  other headers within our own header's extern "C" block, that we always
  tag the entire file contents for doxygen (within the APR_HEADER_H
  only-once block), and generally clean up doxygen so that it is all
  consistent and generates respectable (although not yet 'great') results.

  Major TODO after 0.9.2 releases; fill in the apr.h APR_HAVE/APR_HAS
  and apr_type_t documentation!!!


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64397 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 8 deletions

diff --git a/include/apr_global_mutex.h b/include/apr_global_mutex.h
index 6fe8b3d79..5b456de27 100644
--- a/include/apr_global_mutex.h
+++ b/include/apr_global_mutex.h
@@ -55,23 +55,26 @@
 #ifndef APR_GLOBAL_MUTEX_H
 #define APR_GLOBAL_MUTEX_H
 
+/**
+ * @file apr_global_mutex.h
+ * @brief APR Global Locking Routines
+ */
+
 #include "apr.h"
 #include "apr_proc_mutex.h"    /* only for apr_lockmech_e */
 #include "apr_pools.h"
 #include "apr_errno.h"
+#if APR_PROC_MUTEX_IS_GLOBAL
+#include "apr_proc_mutex.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @file apr_global_mutex.h
- * @brief APR Global Locking Routines
- */
-
-/**
  * @defgroup APR_GlobalMutex Global Locking Routines
- * @ingroup APR
+ * @ingroup APR 
  * @{
  */
 
@@ -168,8 +171,6 @@ APR_POOL_DECLARE_ACCESSOR(global_mutex);
  * Define these platforms in terms of an apr_proc_mutex_t.
  */
 
-#include "apr_proc_mutex.h"
-
 #define apr_global_mutex_t          apr_proc_mutex_t
 #define apr_global_mutex_create     apr_proc_mutex_create
 #define apr_global_mutex_child_init apr_proc_mutex_child_init
@@ -181,6 +182,8 @@ APR_POOL_DECLARE_ACCESSOR(global_mutex);
 
 #endif
 
+/** @} */
+
 #ifdef __cplusplus
 }
 #endif