diff options
| author | joerg <joerg@pkgsrc.org> | 2014-05-27 09:55:03 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2014-05-27 09:55:03 +0000 |
| commit | 9c1a15d0b31eeb7d9f4577a9f823182f4c5622fe (patch) | |
| tree | 3ca80a3eeb2e7953e18caefe1e1429b18b01180e /databases/sqlrelay/patches | |
| parent | d5729dc74cecb79398f00abdc14fd17fa6ec0fca (diff) | |
| download | pkgsrc-9c1a15d0b31eeb7d9f4577a9f823182f4c5622fe.tar.gz | |
Fix build with clang.
Diffstat (limited to 'databases/sqlrelay/patches')
| -rw-r--r-- | databases/sqlrelay/patches/patch-src_api_c++_src_sqlrcursor.cpp | 17 | ||||
| -rw-r--r-- | databases/sqlrelay/patches/patch-src_loggers_custom__sc.cpp | 13 |
2 files changed, 30 insertions, 0 deletions
diff --git a/databases/sqlrelay/patches/patch-src_api_c++_src_sqlrcursor.cpp b/databases/sqlrelay/patches/patch-src_api_c++_src_sqlrcursor.cpp new file mode 100644 index 00000000000..6a020f6bd0a --- /dev/null +++ b/databases/sqlrelay/patches/patch-src_api_c++_src_sqlrcursor.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-src_api_c++_src_sqlrcursor.cpp,v 1.1 2014/05/27 09:55:04 joerg Exp $ + +--- src/api/c++/src/sqlrcursor.cpp.orig 2014-05-23 16:56:02.000000000 +0000 ++++ src/api/c++/src/sqlrcursor.cpp +@@ -4223,10 +4223,10 @@ void sqlrcursor::createFieldLengths() { + // fieldlengths[1] (corresponding to row 4) + uint64_t rowbuffercount=rowcount-firstrowindex; + fieldlengths=new uint32_t *[rowbuffercount+1]; +- fieldlengths[rowbuffercount]=(uint32_t)NULL; ++ fieldlengths[rowbuffercount]=(uint32_t *)NULL; + for (uint64_t i=0; i<rowbuffercount; i++) { + fieldlengths[i]=new uint32_t[colcount+1]; +- fieldlengths[i][colcount]=(uint32_t)NULL; ++ fieldlengths[i][colcount]=0; + for (uint32_t j=0; j<colcount; j++) { + fieldlengths[i][j]=getFieldLengthInternal(i,j); + } diff --git a/databases/sqlrelay/patches/patch-src_loggers_custom__sc.cpp b/databases/sqlrelay/patches/patch-src_loggers_custom__sc.cpp new file mode 100644 index 00000000000..ed60a08e065 --- /dev/null +++ b/databases/sqlrelay/patches/patch-src_loggers_custom__sc.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_loggers_custom__sc.cpp,v 1.1 2014/05/27 09:55:04 joerg Exp $ + +--- src/loggers/custom_sc.cpp.orig 2014-05-23 17:02:08.000000000 +0000 ++++ src/loggers/custom_sc.cpp +@@ -131,7 +131,7 @@ bool custom_sc::run(sqlrlistener *sqlrl, + + // get the client IP, it's needed for some events + const char *clientaddr="unknown"; +- if (sqlrcon && sqlrcon->cont->connstats->clientaddr) { ++ if (sqlrcon && sqlrcon->cont->connstats->clientaddr[0]) { + clientaddr=sqlrcon->cont->connstats->clientaddr; + } + |