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

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

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-07-24 19:45:51 CEST

On Mon, 24 Jul 2006, Daniel Berlin wrote:

> Masaru Tsuchiyama wrote:
> > 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'.
...
> This is wrong.
> You want to use whatever sqlite uses for this, which is sqlite_int64, i
> think.

This'll probably do the trick. Let us know, Masaru.

Index: tree.c
===================================================================
--- tree.c (revision 20836)
+++ tree.c (working copy)
@@ -1102,7 +1102,7 @@
                         apr_pool_t *pool)
 {
   sqlite3_stmt *stmt;
- long long int lastchanged_rev;
+ sqlite_int64 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;
+ sqlite_int64 count;
   svn_boolean_t has_no_mergeinfo = FALSE;
   
   cacheresult = apr_hash_get(cache, path, APR_HASH_KEY_STRING);

  • application/pgp-signature attachment: stored
Received on Mon Jul 24 19:46:39 2006

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