Author: rhuijben
Date: Fri Jun 24 07:30:17 2011
New Revision: 1139179
URL: http://svn.apache.org/viewvc?rev=1139179&view=rev
Log:
Revert r1132968, but don't re-add the duplicated typedef in svn_version.h to
avoid breaking compilation.
* subversion/include/svn_types.h
(svn_version_t): Revert changes from r1132968.
* subversion/include/svn_version.h
(svn_version_t): Revert changes from r1132968 except for the typedef that
would break compilation.
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=1139179&r1=1139178&r2=1139179&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_types.h (original)
+++ subversion/trunk/subversion/include/svn_types.h Fri Jun 24 07:30:17 2011
@@ -131,28 +131,9 @@ typedef struct svn_error_t
} svn_error_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;
+/* See svn_version.h.
+ Defined here to avoid including svn_version.h from all public headers. */
+typedef struct svn_version_t 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=1139179&r1=1139178&r2=1139179&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_version.h (original)
+++ subversion/trunk/subversion/include/svn_version.h Fri Jun 24 07:30:17 2011
@@ -141,6 +141,26 @@ 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.
+ */
+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;
+};
+
+/**
* Define a static svn_version_t object.
*
* @since New in 1.1.
