diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-20 20:04:51 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-22 20:52:34 +0200 |
| commit | bb406680cebd6fa1e1bdb9e2de430cd9a1f44da0 (patch) | |
| tree | e9a843090a3b8842792f1b45cb31d6c415e613d8 /bin | |
| parent | ca8a4c81a4194cfaa526bd8071a2243aad0f3461 (diff) | |
Put definition of _CRT_RAND_S into bin/update_pch
so it doesn't get removed again from sal/inc/pch/precompiled_sal.hxx
(see commit 4af9612f2be9e023e762831207cbdb1d5f25906f).
Also make necessary changes to some of the files that start to fail
building after running bin/update_pch.sh, so that the patch is
self-contained and leaves the tree in fully functional state.
tools namespace had to be prepended with :: to disambiguate from
drawinglayer::tools
vcl/inc/window.h includes were amended, because ExtTextInputAttr is
from vcl/commandevent.hxx, and enum class ShowTrackFlags is from
vcl/window.hxx
Change-Id: I47179622350754cba2f95d26a1bafd3dfbbc935b
Reviewed-on: https://gerrit.libreoffice.org/42559
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/update_pch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/bin/update_pch b/bin/update_pch index 10cac0f9f718..ae275cc83cf9 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -744,6 +744,17 @@ def generate(includes, libname, filename, module): f.write('\n If after updating build fails, use the following command to locate conflicting headers:\n ./bin/update_pch_bisect {} "make {}.build" --find-conflicts\n*/\n'.format( filename, module)) + # sal needs this for rand_s() + if module == 'sal' and libname == 'sal': + sal_define = """ +#if defined(_WIN32) +#if !defined _CRT_RAND_S +#define _CRT_RAND_S +#endif +#endif +""" + f.write(sal_define) + # svx needs this (sendreportw32.cxx) if module == 'svx' and libname == 'svx': svx_define = """ |