Fail try to porting

[tortoisegit/TortoiseGitJp.git] / src / TortoiseMerge / svninclude / svn_types.h

diff --git a/src/TortoiseMerge/svninclude/svn_types.h b/src/TortoiseMerge/svninclude/svn_types.h
index 0b2c547..2d80051 100644 (file)
--- a/src/TortoiseMerge/svninclude/svn_types.h
+++ b/src/TortoiseMerge/svninclude/svn_types.h
@@ -31,11 +31,14 @@
 #include <apr_tables.h>\r
 #include <apr_time.h>\r
 #include <apr_sha1.h>\r
+#include <apr_errno.h>\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
 #endif /* __cplusplus */\r
 \r
+//porting\r
+typedef int svn_version_t;\r
 \r
 \f\r
 /** Macro used to mark deprecated functions.\r
@@ -75,7 +78,7 @@ typedef struct svn_error_t
   struct svn_error_t *child;\r
 \r
   /** The pool holding this error and any child errors it wraps */\r
-  apr_pool_t *pool;\r
+  //apr_pool_t *pool;\r
 \r
   /** Source file where the error originated.  Only used iff @c SVN_DEBUG. */\r
   const char *file;\r
@@ -410,7 +413,7 @@ typedef struct svn_dirent_t
   svn_revnum_t created_rev;\r
 \r
   /** time of created_rev (mod-time) */\r
-  apr_time_t time;\r
+  //apr_time_t time;\r
 \r
   /** author of created_rev */\r
   const char *last_author;\r
@@ -427,7 +430,6 @@ svn_dirent_t *
 svn_dirent_dup(const svn_dirent_t *dirent,\r
                apr_pool_t *pool);\r
 \r
-\f\r
 \r
 /** Keyword substitution.\r
  *\r
@@ -596,14 +598,14 @@ typedef struct svn_log_entry_t
    * they're not, it might be nice to change apr_hash_first() so\r
    * read-only uses of hashes can be protected via the type system.\r
    */\r
-  apr_hash_t *changed_paths;\r
+  //apr_hash_t *changed_paths;\r
 \r
   /** The revision of the commit. */\r
   svn_revnum_t revision;\r
 \r
   /** The hash of requested revision properties, which may be NULL if it\r
    * would contain no revprops. */\r
-  apr_hash_t *revprops;\r
+//  apr_hash_t *revprops;\r
 \r
   /**\r
    * Whether or not this message has children.\r