fix build with 64-bit time_t; from NetBSD via dcoppa@

This commit is contained in:
naddy 2013-08-16 16:13:44 +00:00
parent c3f2e93ae3
commit e29e846f19
3 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_storage_sql_storage_cc,v 1.1 2013/08/16 16:13:44 naddy Exp $
--- src/storage/sql_storage.cc.orig Thu Mar 25 16:28:10 2010
+++ src/storage/sql_storage.cc Fri Aug 16 18:08:26 2013
@@ -2133,7 +2133,7 @@ void SQLStorage::autoscanUpdateLM(Ref<AutoscanDirector
throw _Exception(_("autoscanUpdateLM called with adir with illegal objectID and location"));
}
*/
- log_debug("id: %d; last_modified: %d\n", adir->getStorageID(), adir->getPreviousLMT());
+ log_debug("id: %d; last_modified: %lld\n", adir->getStorageID(), (long long)adir->getPreviousLMT());
Ref<StringBuffer> q(new StringBuffer());
*q << "UPDATE " << TQ(AUTOSCAN_TABLE)
<< " SET " << TQ("last_modified") << '=' << quote(adir->getPreviousLMT())

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_storage_sql_storage_h,v 1.1 2013/08/16 16:13:44 naddy Exp $
--- src/storage/sql_storage.h.orig Thu Mar 25 15:58:06 2010
+++ src/storage/sql_storage.h Fri Aug 16 18:04:25 2013
@@ -79,6 +79,7 @@ class SQLStorage : protected Storage (public)
virtual zmm::String quote(unsigned int val) = 0;
virtual zmm::String quote(long val) = 0;
virtual zmm::String quote(unsigned long val) = 0;
+ virtual zmm::String quote(long long val) = 0;
virtual zmm::String quote(bool val) = 0;
virtual zmm::String quote(char val) = 0;
virtual zmm::Ref<SQLResult> select(const char *query, int length) = 0;

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_storage_sqlite3_sqlite3_storage_h,v 1.1 2013/08/16 16:13:44 naddy Exp $
--- src/storage/sqlite3/sqlite3_storage.h.orig Thu Mar 25 15:58:06 2010
+++ src/storage/sqlite3/sqlite3_storage.h Fri Aug 16 18:06:02 2013
@@ -158,6 +158,7 @@ class Sqlite3Storage : private SQLStorage (private)
virtual inline zmm::String quote(unsigned int val) { return zmm::String::from(val); }
virtual inline zmm::String quote(long val) { return zmm::String::from(val); }
virtual inline zmm::String quote(unsigned long val) { return zmm::String::from(val); }
+ virtual inline zmm::String quote(long long val) { return zmm::String::from(val); }
virtual inline zmm::String quote(bool val) { return zmm::String(val ? '1' : '0'); }
virtual inline zmm::String quote(char val) { return quote(zmm::String(val)); }
virtual zmm::Ref<SQLResult> select(const char *query, int length);