diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:34:42 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:34:42 +0200 |
| commit | 19b4ac2256e23322fe575ce8683184dc8d1e4145 (patch) | |
| tree | 2754e4b70c69809f27ac13484d000697aa70d4bd | |
| parent | 6b6e4276070f81d5cae4903b9ecb650b5d1e0f41 (diff) | |
| parent | 23d70d01fca663a9c93d1f3eab15f60cbf5e332e (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I76e5aaf1e66094967c9c32b4cc1512a3934e3c0a
| -rw-r--r-- | src/knx/ssl/qsslsocket_openssl_symbols_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/knx/ssl/qsslsocket_openssl_symbols_p.h b/src/knx/ssl/qsslsocket_openssl_symbols_p.h index cf7cac3..c5ae895 100644 --- a/src/knx/ssl/qsslsocket_openssl_symbols_p.h +++ b/src/knx/ssl/qsslsocket_openssl_symbols_p.h @@ -256,6 +256,10 @@ Q_DECLARE_LOGGING_CATEGORY(lcSsl) # define DEFINEFUNC7(ret, func, arg1, a, arg2, b, arg3, c, arg4, d, arg5, e, arg6, f, arg7, g, err, funcret) \ ret q_##func(arg1, arg2, arg3, arg4, arg5, arg6, arg7) { funcret func(a, b, c, d, e, f, g); } +// ret func(arg1, arg2, arg3, arg4, arg6, arg7, arg8) +# define DEFINEFUNC8(ret, func, arg1, a, arg2, b, arg3, c, arg4, d, arg5, e, arg6, f, arg7, g, arg8, h, err, funcret) \ + ret q_##func(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) { funcret func(a, b, c, d, e, f, g, h); } + // ret func(arg1, arg2, arg3, arg4, arg6, arg7, arg8, arg9) # define DEFINEFUNC9(ret, func, arg1, a, arg2, b, arg3, c, arg4, d, arg5, e, arg6, f, arg7, g, arg8, h, arg9, i, err, funcret) \ ret q_##func(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) { funcret func(a, b, c, d, e, f, g, h, i); } |