diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-04-04 14:57:45 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-04-04 16:12:11 +0000 |
| commit | 9ac98e6e3488e434bf4864ecfb13a121784f640b (patch) | |
| tree | b3c9cbf52126fee5864be12e9109f7413e7a0878 /sd/source/ui/remotecontrol | |
| parent | 6f995da5a652d993ab253b3363188cd18e289728 (diff) | |
Finally switch MSVC to sal_Unicode = char16_t, too
There is lots of (Windows-only) code that relied on sal_Unicode being the same
as wchar_t, and the best change may be different in each case (and doing the
changes may be somewhat error prone). So for now add SAL_U/SAL_W scaffolding
functions to sal/types.h, remove their uses one by one again, and finally drop
those functions again.
Change-Id: I2cc791bd941d089901abb5f6fc2f05fbc49e65ea
Reviewed-on: https://gerrit.libreoffice.org/36077
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sd/source/ui/remotecontrol')
| -rw-r--r-- | sd/source/ui/remotecontrol/DiscoveryService.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx index 81123828777b..2eb8e36af9e8 100644 --- a/sd/source/ui/remotecontrol/DiscoveryService.cxx +++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx @@ -126,7 +126,7 @@ void DiscoveryService::setupSockets() #if defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_VISTA IN_ADDR addr; OUString const saddr("239.0.0.1"); - INT ret = InetPtonW(AF_INET, saddr.getStr(), & addr); + INT ret = InetPtonW(AF_INET, SAL_W(saddr.getStr()), & addr); if (1 == ret) { multicastRequest.imr_multiaddr.s_addr = addr.S_un.S_addr; |