diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2018-09-10 15:20:46 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2018-09-10 15:20:46 +0000 |
| commit | 7017780305bac4677f258e99be92b71ae98dcc36 (patch) | |
| tree | 447eb9e9e153e8637d34f3b2be30454c5920c944 /databases/libdrizzle-redux/files/patch-libdrizzle_binlog.cc | |
| parent | Update to 1.4.4 (diff) | |
databases/libdrizzle-redux: Fix build with Clang 6
libdrizzle/binlog.cc:319:48: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
"packet size error:%"PRIu32":%"PRIu32, con->packet_size, binlog_event->length);
^
http://beefy12.nyi.freebsd.org/data/head-amd64-default/p479076_s338486/logs/errors/libdrizzle-redux-5.1.4_2.log
PR: 230958
Approved by: jim@ohlste.in (maintainer timeout, 2 weeks)
Diffstat (limited to 'databases/libdrizzle-redux/files/patch-libdrizzle_binlog.cc')
| -rw-r--r-- | databases/libdrizzle-redux/files/patch-libdrizzle_binlog.cc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/databases/libdrizzle-redux/files/patch-libdrizzle_binlog.cc b/databases/libdrizzle-redux/files/patch-libdrizzle_binlog.cc new file mode 100644 index 000000000000..269818bb76a4 --- /dev/null +++ b/databases/libdrizzle-redux/files/patch-libdrizzle_binlog.cc @@ -0,0 +1,20 @@ +--- libdrizzle/binlog.cc.orig 2018-08-27 19:29:31 UTC ++++ libdrizzle/binlog.cc +@@ -316,7 +316,7 @@ drizzle_return_t drizzle_state_binlog_read(drizzle_st + if (con->packet_size != binlog_event->length) + { + drizzle_set_error(con, "drizzle_state_binlog_read", +- "packet size error:%"PRIu32":%"PRIu32, con->packet_size, binlog_event->length); ++ "packet size error:%" PRIu32 ":%" PRIu32, con->packet_size, binlog_event->length); + con->binlog->error_fn(DRIZZLE_RETURN_UNEXPECTED_DATA, con, con->binlog->binlog_context); + return DRIZZLE_RETURN_UNEXPECTED_DATA; + } +@@ -374,7 +374,7 @@ drizzle_return_t drizzle_state_binlog_read(drizzle_st + event_crc= (uint32_t)crc32(0, binlog_event->raw_data, (binlog_event->raw_length - DRIZZLE_BINLOG_CRC32_LEN)); + if (event_crc != binlog_event->checksum) + { +- drizzle_set_error(con, __func__, "CRC doesn't match: 0x%"PRIX32", 0x%"PRIX32, event_crc, binlog_event->checksum); ++ drizzle_set_error(con, __func__, "CRC doesn't match: 0x%" PRIX32 ", 0x%" PRIX32, event_crc, binlog_event->checksum); + con->binlog->error_fn(DRIZZLE_RETURN_BINLOG_CRC, con, con->binlog->binlog_context); + return DRIZZLE_RETURN_BINLOG_CRC; + } |