Author: rhuijben
Date: Tue Jun 7 12:14:14 2011
New Revision: 1132968
URL: http://svn.apache.org/viewvc?rev=1132968&view=rev
Log:
Following up on r1132965, just move the type. This matches how we handled the
problem for svn_error_t.
* subversion/include/svn_types.h
(svn_version_t): Add full definition here.
* subversion/include/svn_version.h
(svn_version_t): And remove it here.
Modified:
subversion/trunk/subversion/include/svn_types.h
subversion/trunk/subversion/include/svn_version.h
Modified: subversion/trunk/subversion/include/svn_types.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_types.h?rev=1132968&r1=1132967&r2=1132968&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_types.h (original)
+++ subversion/trunk/subversion/include/svn_types.h Tue Jun 7 12:14:14 2011
@@ -131,9 +131,28 @@ typedef struct svn_error_t
} svn_error_t;
-/* See svn_version.h.
- Defined here to avoid including svn_version.h from all public headers. */
-typedef struct svn_version_t svn_version_t;
+/**
+ * Version information. Each library contains a function called
+ * svn_<i>libname</i>_version() that returns a pointer to a statically
+ * allocated object of this type.
+ *
+ * @since New in 1.1.
+ *
+ * Defined here, rather than in svn_version.h, to avoid a recursive @#include
+ * situation.
+ */
+typedef struct svn_version_t
+{
+ int major; /**< Major version number */
+ int minor; /**< Minor version number */
+ int patch; /**< Patch number */
+
+ /**
+ * The version tag (#SVN_VER_NUMTAG). Must always point to a
+ * statically allocated string.
+ */
+ const char *tag;
+} svn_version_t;
/** @defgroup APR_ARRAY_compat_macros APR Array Compatibility Helper Macros
* These macros are provided by APR itself from version 1.3.
Modified: subversion/trunk/subversion/include/svn_version.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_version.h?rev=1132968&r1=1132967&r2=1132968&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_version.h (original)
+++ subversion/trunk/subversion/include/svn_version.h Tue Jun 7 12:14:14 2011
@@ -141,26 +141,6 @@ extern "C" {
/* Version queries and compatibility checks */
/**
- * Version information. Each library contains a function called
- * svn_<i>libname</i>_version() that returns a pointer to a statically
- * allocated object of this type.
- *
- * @since New in 1.1.
- */
-typedef struct svn_version_t
-{
- int major; /**< Major version number */
- int minor; /**< Minor version number */
- int patch; /**< Patch number */
-
- /**
- * The version tag (#SVN_VER_NUMTAG). Must always point to a
- * statically allocated string.
- */
- const char *tag;
-} svn_version_t;
-
-/**
* Define a static svn_version_t object.
*
* @since New in 1.1.
