[Libreoffice-commits] core.git: sal/osl

Stephan Bergmann sbergman at redhat.com
Mon Sep 18 08:01:21 UTC 2017


 sal/osl/w32/file.cxx        |    8 ++++++++
 sal/osl/w32/file_dirvol.cxx |    1 +
 sal/osl/w32/procimpl.cxx    |    2 ++
 sal/osl/w32/signal.cxx      |    3 +++
 4 files changed, 14 insertions(+)

New commits:
commit 74cd94a17b3922bdcd44ab6460232297fbf665d0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 18 09:59:33 2017 +0200

    Put back some #include (needed for e.g. --disable-pch)
    
    ...that had been removed too eagerly with
    1f543b817a7e8bdef9482c4c61bc1672bf04e39f "osl/w32: don't use 8-bit string
    functions"
    
    Change-Id: I9d16cc5ff9b779457d8d70c7f206d5e684342c63

diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index f654c1add897..a211464aa2cd 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -19,9 +19,17 @@
 
 #include <systools/win32/uwinapi.h>
 
+#include <osl/file.hxx>
+#include <rtl/alloc.h>
+#include <rtl/byteseq.h>
+
 #include "file_url.hxx"
 #include "file_error.hxx"
 
+#include <cassert>
+#include <algorithm>
+#include <limits>
+
 #ifdef max /* conflict w/ std::numeric_limits<T>::max() */
 #undef max
 #endif
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 752d6470ec67..46f185d0554e 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -27,6 +27,7 @@
 
 #include "rtl/alloc.h"
 #include "rtl/ustring.hxx"
+#include <rtl/character.hxx>
 
 static const wchar_t UNC_PREFIX[] = L"\\\\";
 static const wchar_t BACKSLASH = '\\';
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index af5b75e5891f..bc7617f3a834 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -34,8 +34,10 @@
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include "secimpl.hxx"
+#include <osl/file.hxx>
 
 #include <vector>
+#include <algorithm>
 
 namespace /* private */
 {
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index 0f6bc08dc9dc..5f11b8a6bcf6 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+#include <config_features.h>
+
 #include <signalshared.hxx>
 
 #include <systools/win32/uwinapi.h>


More information about the Libreoffice-commits mailing list