[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] to fix a compile error of merge-tracking on Windows

From: Masaru Tsuchiyama <tsuchiyama_at_asahi-net.email.ne.jp>
Date: 2006-07-23 11:34:59 CEST

This is a patch to fix a compile error of merge-tracking
branch with Visual C++ 6 on Windows. VC doesn't support
the variable type 'long long int'.

(But it is not enough to compile it with VC because
there is no project file for sqlite3 files. I edited
the project file manually.)

Index: subversion/libsvn_fs_fs/tree.c
--- subversion/libsvn_fs_fs/tree.c (revision 20833)
+++ subversion/libsvn_fs_fs/tree.c (working copy)
@@ -1102,7 +1102,7 @@
                         apr_pool_t *pool)
   sqlite3_stmt *stmt;
- long long int lastchanged_rev;
+ apr_int64_t lastchanged_rev;
   int sqlite_result;
   SQLITE_ERR(sqlite3_prepare(db, "SELECT MAX(revision) from mergeinfo_changed"
@@ -1228,7 +1228,7 @@
   apr_hash_t *cacheresult;
   sqlite3_stmt *stmt;
   int sqlite_result;
- long long int count;
+ apr_int64_t count;
   svn_boolean_t has_no_mergeinfo = FALSE;
   cacheresult = apr_hash_get(cache, path, APR_HASH_KEY_STRING);


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jul 23 11:35:33 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.