OSDN Git Service

Fail try to porting
authorFrank Li <lznuaa@gmail.com>
Wed, 17 Dec 2008 05:11:47 +0000 (13:11 +0800)
committerFrank Li <lznuaa@gmail.com>
Wed, 17 Dec 2008 05:11:47 +0000 (13:11 +0800)
16 files changed:
src/TortoiseMerge/DiffData.cpp
src/TortoiseMerge/DiffData.h
src/TortoiseMerge/TortoiseMerge.vcproj
src/TortoiseMerge/libsvn_diff/diff_file.c
src/TortoiseMerge/libsvn_diff/token.c
src/TortoiseMerge/svninclude/apr.h
src/TortoiseMerge/svninclude/apr_file_info.h
src/TortoiseMerge/svninclude/apr_file_io.h
src/TortoiseMerge/svninclude/apr_getopt.h
src/TortoiseMerge/svninclude/apr_hash.h
src/TortoiseMerge/svninclude/apr_pools.h
src/TortoiseMerge/svninclude/apr_tables.h
src/TortoiseMerge/svninclude/apr_time.h
src/TortoiseMerge/svninclude/svn_error_codes.h
src/TortoiseMerge/svninclude/svn_pools.h
src/TortoiseMerge/svninclude/svn_types.h

index d3c26ab..0bbcd64 100644 (file)
@@ -17,7 +17,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
 //\r
 #include "StdAfx.h"\r
-//#include "diff.h"\r
+#include "diff.h"\r
 #include "TempFiles.h"\r
 #include "registry.h"\r
 #include "Resource.h"\r
@@ -87,7 +87,7 @@ LPCTSTR CDiffData::GetLineChars(int index)
 \r
 BOOL CDiffData::Load()\r
 {\r
-#if 0\r
+\r
        CString sConvertedBaseFilename, sConvertedTheirFilename, sConvertedYourFilename;\r
        apr_pool_t * pool;\r
 \r
@@ -220,19 +220,19 @@ BOOL CDiffData::Load()
 \r
        apr_pool_destroy (pool);                                        // free the allocated memory\r
 \r
-#endif\r
+\r
        return TRUE;\r
 }\r
 \r
 \r
 bool\r
-CDiffData::DoTwoWayDiff(const CString& sBaseFilename, const CString& sYourFilename, DWORD dwIgnoreWS, bool bIgnoreEOL)\r
+CDiffData::DoTwoWayDiff(const CString& sBaseFilename, const CString& sYourFilename, DWORD dwIgnoreWS, bool bIgnoreEOL,apr_pool_t *pool)\r
 {\r
        // convert CString filenames (UTF-16 or ANSI) to UTF-8\r
        CStringA sBaseFilenameUtf8 = CUnicodeUtils::GetUTF8(sBaseFilename);\r
        CStringA sYourFilenameUtf8 = CUnicodeUtils::GetUTF8(sYourFilename);\r
 \r
-#if 0\r
+\r
        svn_diff_t * diffYourBase = NULL;\r
        svn_error_t * svnerr = NULL;\r
        svn_diff_file_options_t * options = svn_diff_file_options_create(pool);\r
@@ -457,18 +457,18 @@ CDiffData::DoTwoWayDiff(const CString& sBaseFilename, const CString& sYourFilena
                tempdiff = tempdiff->next;\r
        }\r
        TRACE(_T("done with 2-way diff\n"));\r
-#endif\r
+\r
        return true;\r
 }\r
 \r
 bool\r
-CDiffData::DoThreeWayDiff(const CString& sBaseFilename, const CString& sYourFilename, const CString& sTheirFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, bool bIgnoreCase)\r
+CDiffData::DoThreeWayDiff(const CString& sBaseFilename, const CString& sYourFilename, const CString& sTheirFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, bool bIgnoreCase,apr_pool_t *pool)\r
 {\r
        // convert CString filenames (UTF-16 or ANSI) to UTF-8\r
        CStringA sBaseFilenameUtf8  = CUnicodeUtils::GetUTF8(sBaseFilename);\r
        CStringA sYourFilenameUtf8  = CUnicodeUtils::GetUTF8(sYourFilename);\r
        CStringA sTheirFilenameUtf8 = CUnicodeUtils::GetUTF8(sTheirFilename);\r
-#if 0\r
+\r
        svn_diff_t * diffTheirYourBase = NULL;\r
        svn_diff_file_options_t * options = svn_diff_file_options_create(pool);\r
        options->ignore_eol_style = bIgnoreEOL;\r
@@ -871,7 +871,7 @@ CDiffData::DoThreeWayDiff(const CString& sBaseFilename, const CString& sYourFile
        }\r
        ASSERT(m_Diff3.GetCount() == m_YourBaseBoth.GetCount());\r
        ASSERT(m_TheirBaseBoth.GetCount() == m_YourBaseBoth.GetCount());\r
-#endif\r
+\r
        TRACE(_T("done with 3-way diff\n"));\r
        return true;\r
 }\r
index b2edc50..ee698b6 100644 (file)
@@ -18,8 +18,8 @@
 //\r
 #pragma once\r
 \r
-//#include "svn_diff.h"\r
-//#include "apr_pools.h"\r
+#include "svn_diff.h"\r
+#include "apr_pools.h"\r
 #include "FileTextLines.h"\r
 #include "Registry.h"\r
 #include "WorkingFile.h"\r
@@ -51,8 +51,8 @@ public:
        bool    IsYourFileInUse() const         { return m_yourFile.InUse(); }\r
 \r
 private:\r
-       bool DoTwoWayDiff(const CString& sBaseFilename, const CString& sYourFilename, DWORD dwIgnoreWS, bool bIgnoreEOL);\r
-       bool DoThreeWayDiff(const CString& sBaseFilename, const CString& sYourFilename, const CString& sTheirFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, bool bIgnoreCase);\r
+       bool DoTwoWayDiff(const CString& sBaseFilename, const CString& sYourFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, apr_pool_t * pool);\r
+       bool DoThreeWayDiff(const CString& sBaseFilename, const CString& sYourFilename, const CString& sTheirFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, bool bIgnoreCase,apr_pool_t * pool);\r
 \r
 \r
 public:\r
index 4981c77..8e87ef4 100644 (file)
@@ -47,7 +47,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="svninclude;..\Utils;..\Git;..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="libsvn_diff;svninclude;..\Utils;..\Git;..\Utils\MiscUI;"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -72,7 +72,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib ../../ext/Subversion\debug_win32\libsvn_diff-nonet.lib ../../ext/Subversion\debug_win32\libsvn_subr-nonet.lib ../../ext/Subversion\debug_win32\libsvn_client-nonet.lib ../../ext/apr\debug_win32\libapr_tsvn.lib ../../ext/apr-util\debug_win32\libaprutil_tsvn.lib ../../ext/libintl/libintl3-win32/lib/intl3_tsvn.lib ../../ext/Subversion\debug_win32\libsvn_wc-nonet.lib ../../ext/Subversion\debug_win32\libsvn_delta-nonet.lib ../../ext/apr-util\xml\expat\lib\debug_win32\xml.lib"\r
+                               AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="3"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="svninclude;..\Utils;..\Git;..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="libsvn_diff;svninclude;..\Utils;..\Git;..\Utils\MiscUI;"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"\r
                                MinimalRebuild="false"\r
                                RuntimeLibrary="2"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="3"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="svninclude;..\Utils;..\Git;..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="libsvn_diff;svninclude;..\Utils;..\Git;..\Utils\MiscUI;"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"\r
                                MinimalRebuild="false"\r
                                RuntimeLibrary="0"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="svninclude;..\Utils;..\Git;..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="libsvn_diff;svninclude;..\Utils;..\Git;..\Utils\MiscUI;"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"\r
                                MinimalRebuild="false"\r
                                RuntimeLibrary="1"\r
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\Resources\download.avi"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\lineadded.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\lineconflicted.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\lineconflictedignored.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\lineedited.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\LineEndingCR.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\LineEndingCRLF.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\LineEndingLF.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\lineequal.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\lineremoved.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\linewhitespace.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\Toolbar.bmp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\TortoiseMerge.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\TortoiseMerge.rc2"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\tortoisemerge_logoflipped.bmp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\TortoiseMergeENG.rc"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\tortoisesvn_logoflipped.bmp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Resources\ttf_glyph.bmp"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
                        Name="Utils"\r
                        >\r
                        <Filter\r
                        Name="libsvndiff"\r
                        >\r
                        <File\r
+                               RelativePath=".\svninclude\apr.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_errno.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_file_info.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_file_io.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_general.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_getopt.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_hash.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_mmap.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_pools.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_sha1.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_strings.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_tables.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_time.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\apr_want.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\libsvn_diff\diff.c"\r
                                >\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\libsvn_diff\diff_memory.c"\r
+                               RelativePath=".\libsvn_diff\lcs.c"\r
                                >\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\libsvn_diff\lcs.c"\r
+                               RelativePath=".\libsvn_diff\porting.c"\r
                                >\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
+                               RelativePath=".\svninclude\svn_error.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\svn_error_codes.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\svn_pools.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\svn_string.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\svninclude\svn_types.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\libsvn_diff\token.c"\r
                                >\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
                        <File\r
-                               RelativePath=".\libsvn_diff\util.c"\r
+                               RelativePath="..\Resources\download.avi"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\lineadded.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\lineconflicted.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\lineconflictedignored.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\lineedited.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\LineEndingCR.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\LineEndingCRLF.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\LineEndingLF.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\lineequal.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\lineremoved.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\linewhitespace.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\Toolbar.bmp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\TortoiseMerge.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\TortoiseMerge.rc2"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\tortoisemerge_logoflipped.bmp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\TortoiseMergeENG.rc"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\tortoisesvn_logoflipped.bmp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\ttf_glyph.bmp"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="release_static|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="debug_static|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                </Filter>\r
        </Files>\r
index 88f6a1d..0d24ef6 100644 (file)
 #include <apr_getopt.h>\r
 \r
 #include "svn_error.h"\r
-#include "svn_diff.h"\r
 #include "svn_types.h"\r
+\r
 #include "svn_string.h"\r
-#include "svn_io.h"\r
-#include "svn_utf.h"\r
+//#include "svn_io.h"\r
+//#include "svn_utf.h"\r
 #include "svn_pools.h"\r
 #include "diff.h"\r
-#include "svn_private_config.h"\r
-#include "svn_path.h"\r
-#include "svn_ctype.h"\r
+//#include "svn_private_config.h"\r
+//#include "svn_path.h"\r
+//#include "svn_ctype.h"\r
+#include "svn_diff.h"\r
+\r
 \r
-/* A token, i.e. a line read from a file. */\r
+/* A token, i.e. a line read from a\r
+file. */\r
 typedef struct svn_diff__file_token_t\r
 {\r
   /* Next token in free list. */\r
@@ -555,6 +558,7 @@ svn_diff_file_options_create(apr_pool_t *pool)
   return apr_pcalloc(pool, sizeof(svn_diff_file_options_t));\r
 }\r
 \r
+#if 0\r
 svn_error_t *\r
 svn_diff_file_options_parse(svn_diff_file_options_t *options,\r
                             const apr_array_header_t *args,\r
@@ -611,7 +615,7 @@ svn_diff_file_options_parse(svn_diff_file_options_t *options,
 \r
   return SVN_NO_ERROR;\r
 }\r
-\r
+#endif\r
 svn_error_t *\r
 svn_diff_file_diff_2(svn_diff_t **diff,\r
                      const char *original,\r
@@ -1107,6 +1111,7 @@ output_unified_diff_modified(void *baton,
   return SVN_NO_ERROR;\r
 }\r
 \r
+#if 0\r
 /* Set *HEADER to a new string consisting of PATH, a tab, and PATH's mtime. */\r
 static svn_error_t *\r
 output_unified_default_hdr(const char **header, const char *path,\r
@@ -1127,6 +1132,7 @@ output_unified_default_hdr(const char **header, const char *path,
 \r
   return SVN_NO_ERROR;\r
 }\r
+#endif\r
 \r
 static const svn_diff_output_fns_t svn_diff__file_output_unified_vtable =\r
 {\r
index 5bc612c..47e7963 100644 (file)
 #include <apr_pools.h>\r
 #include <apr_general.h>\r
 \r
-#include "svn_error.h"\r
-#include "svn_diff.h"\r
-#include "svn_types.h"\r
-\r
 #include "diff.h"\r
 \r
 \r
index 1e8c2b8..d8cacf5 100644 (file)
@@ -304,7 +304,7 @@ extern "C" {
 /*  APR Feature Macros */\r
 #define APR_HAS_SHARED_MEMORY     1\r
 #define APR_HAS_THREADS           1\r
-#define APR_HAS_MMAP              1\r
+#define APR_HAS_MMAP              0\r
 #define APR_HAS_FORK              0\r
 #define APR_HAS_RANDOM            1\r
 #define APR_HAS_OTHER_CHILD       1\r
index e69de29..d620439 100644 (file)
@@ -0,0 +1,6 @@
+#ifndef ARP_FILE_INFO_XX\r
+#define ARP_FILE_INFO_XX\r
+#include "apr_time.h"\r
+\r
+\r
+#endif
\ No newline at end of file
index e69de29..10e3b89 100644 (file)
@@ -0,0 +1,21 @@
+#ifndef ARP_FILE_IO_XX\r
+#define ARP_FILE_IO_XX\r
+typedef FILE apr_file_t;\r
+#define APR_SET SEEK_SET\r
+#define APR_READ 0\r
+#define APR_OS_DEFAULT 0\r
+#define APR_FINFO_SIZE 0\r
+\r
+struct apr_getopt_option_t {\r
+    /** long option name, or NULL if option has no long name */\r
+    const char *name;\r
+    /** option letter, or a value greater than 255 if option has no letter */\r
+    int optch;\r
+    /** nonzero if option takes an argument */\r
+    int has_arg;\r
+    /** a description of the option */\r
+    const char *description;\r
+};\r
+\r
+typedef struct apr_getopt_option_t apr_getopt_option_t;\r
+#endif
\ No newline at end of file
index e69de29..a2624fd 100644 (file)
@@ -0,0 +1,61 @@
+#ifndef APR_GETOPT_XX\r
+#define APR_GETOPT_XX\r
+/** @see apr_getopt_t */\r
+typedef struct apr_getopt_t apr_getopt_t;\r
+\r
+/**\r
+ * Structure to store command line argument information.\r
+ */ \r
+struct apr_getopt_t {\r
+    /** context for processing */\r
+    apr_pool_t *cont;\r
+    /** function to print error message (NULL == no messages) */\r
+//    apr_getopt_err_fn_t *errfn;\r
+    /** user defined first arg to pass to error message  */\r
+    void *errarg;\r
+    /** index into parent argv vector */\r
+    int ind;\r
+    /** character checked for validity */\r
+    int opt;\r
+    /** reset getopt */\r
+    int reset;\r
+    /** count of arguments */\r
+    int argc;\r
+    /** array of pointers to arguments */\r
+    const char **argv;\r
+    /** argument associated with option */\r
+    char const* place;\r
+    /** set to nonzero to support interleaving options with regular args */\r
+    int interleave;\r
+    /** start of non-option arguments skipped for interleaving */\r
+    int skip_start;\r
+    /** end of non-option arguments skipped for interleaving */\r
+    int skip_end;\r
+};\r
+\r
+struct apr_finfo_t {\r
+    /** Allocates memory and closes lingering handles in the specified pool */\r
+    apr_pool_t *pool;\r
+    /** The bitmask describing valid fields of this apr_finfo_t structure \r
+     *  including all available 'wanted' fields and potentially more */\r
+    apr_int32_t valid;\r
+    /** The access permissions of the file.  Mimics Unix access rights. */\r
+   \r
+    apr_off_t size;\r
+    /** The storage size consumed by the file */\r
+    apr_off_t csize;\r
+    /** The time the file was last accessed */\r
+    apr_time_t atime;\r
+    /** The time the file was last modified */\r
+    apr_time_t mtime;\r
+    /** The time the file was created, or the inode was last changed */\r
+    apr_time_t ctime;\r
+    /** The pathname of the file (possibly unrooted) */\r
+    const char *fname;\r
+    /** The file's name (no path) in filesystem case */\r
+    const char *name;\r
+\r
+};\r
+\r
+typedef struct apr_finfo_t apr_finfo_t;\r
+#endif
\ No newline at end of file
index e69de29..7d8bf4d 100644 (file)
@@ -0,0 +1,6 @@
+#ifndef APR_HASH_XX\r
+#define APR_HASH_XX\r
+\r
+typedef int apr_hash_t;\r
+\r
+#endif
\ No newline at end of file
index e69de29..e388aa1 100644 (file)
@@ -0,0 +1,31 @@
+#ifndef APR_POOLS_XX\r
+#define APR_POOLS_XX\r
+\r
+typedef struct\r
+{\r
+       unsigned char *data;\r
+       int size;\r
+       int start;\r
+\r
+}apr_pool_t;\r
+\r
+typedef int (*apr_abortfunc_t)(int retcode);\r
+\r
+#ifdef __CPLUSPLUS_\r
+extern "C"\r
+{\r
+#endif\r
+void * apr_palloc(apr_pool_t *p, apr_size_t size);\r
+\r
+int apr_pool_create_ex(apr_pool_t **newpool,\r
+                                             apr_pool_t *parent,\r
+                                             apr_abortfunc_t abort_fn,\r
+                                             void *allocator);\r
+void apr_pool_destroy(apr_pool_t *p);\r
+\r
+#ifdef __CPLUSPLUS_\r
+extern "C"\r
+}\r
+#endif\r
+\r
+#endif\r
index e69de29..bd25a22 100644 (file)
@@ -0,0 +1,6 @@
+#ifndef APR_TABEL_XX\r
+#define ARP_TABEL_XX\r
+\r
+typedef int apr_array_header_t ;\r
+\r
+#endif
\ No newline at end of file
index e69de29..2036913 100644 (file)
@@ -0,0 +1,7 @@
+#ifndef APR_TIME_XX\r
+#define APR_TIME_XX\r
+\r
+typedef int apr_time_t;\r
+
+\r
+#endif
\ No newline at end of file
index ccd7155..91d3ffb 100644 (file)
@@ -45,7 +45,7 @@
 #include <apr.h>\r
 #include <apr_errno.h>     /* APR's error system */\r
 \r
-#include "svn_props.h"     /* For SVN_PROP_EXTERNALS. */\r
+//#include "svn_props.h"     /* For SVN_PROP_EXTERNALS. */\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
index e69de29..6d29bfb 100644 (file)
@@ -0,0 +1,8 @@
+#ifndef SVN_POOLS_XX\r
+#define SVN_POOLS_XX\r
+\r
+typedef TCHAR * svn_stream_t;\r
+typedef BOOL svn_boolean_t;\r
+\r
+\r
+#endif
\ No newline at end of file
index 0b2c547..2d80051 100644 (file)
 #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