summaryrefslogtreecommitdiff
path: root/sal/osl
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-04-07 12:37:56 +0300
committerTor Lillqvist <tml@collabora.com>2016-04-07 12:41:11 +0300
commitc5e119f51bd07fb11ac04a58dacf3f79695d02a9 (patch)
treec297bc8e4f04e1a8b1c45162192bf5ef9b204f2d /sal/osl
parent43a31e3a727760cf4cf82cdc19ca4c8dcc8a057d (diff)
Drop pointless "internal" directory level for already internal include files
Change-Id: I496fdbab3e17c806c2d16513412c4c1b9120bc3c
Diffstat (limited to 'sal/osl')
-rw-r--r--sal/osl/all/log.cxx2
-rw-r--r--sal/osl/all/signalshared.cxx2
-rw-r--r--sal/osl/unx/backtraceapi.cxx2
-rw-r--r--sal/osl/unx/memory.cxx2
-rw-r--r--sal/osl/unx/random.cxx2
-rw-r--r--sal/osl/unx/signal.cxx2
-rw-r--r--sal/osl/w32/backtrace.cxx2
-rw-r--r--sal/osl/w32/dllentry.c2
-rw-r--r--sal/osl/w32/memory.c2
-rw-r--r--sal/osl/w32/signal.cxx2
10 files changed, 10 insertions, 10 deletions
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index a010c333d555..20efa68ee645 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -25,7 +25,7 @@
#include "sal/detail/log.h"
#include "sal/log.hxx"
#include "sal/types.h"
-#include "internal/misc.hxx"
+#include "misc.hxx"
#include "logformat.hxx"
diff --git a/sal/osl/all/signalshared.cxx b/sal/osl/all/signalshared.cxx
index f444f37afd50..d4615b3a153e 100644
--- a/sal/osl/all/signalshared.cxx
+++ b/sal/osl/all/signalshared.cxx
@@ -19,7 +19,7 @@
#include <sal/config.h>
-#include <internal/signalshared.hxx>
+#include <signalshared.hxx>
#include <osl/diagnose.h>
diff --git a/sal/osl/unx/backtraceapi.cxx b/sal/osl/unx/backtraceapi.cxx
index a2a2cac3aa4c..1895c4360837 100644
--- a/sal/osl/unx/backtraceapi.cxx
+++ b/sal/osl/unx/backtraceapi.cxx
@@ -10,7 +10,7 @@
#include <sal/config.h>
#include <rtl/ustrbuf.hxx>
-#include "internal/misc.hxx"
+#include "misc.hxx"
// FIXME: no-op for now; it needs implementing, cf. above.
rtl_uString *osl_backtraceAsString()
diff --git a/sal/osl/unx/memory.cxx b/sal/osl/unx/memory.cxx
index c016baa97a00..db376ecaf722 100644
--- a/sal/osl/unx/memory.cxx
+++ b/sal/osl/unx/memory.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <internal/oslmemory.h>
+#include <oslmemory.h>
#include <stdlib.h>
#ifdef __ANDROID__
diff --git a/sal/osl/unx/random.cxx b/sal/osl/unx/random.cxx
index a0fb73c92867..f9c97755b233 100644
--- a/sal/osl/unx/random.cxx
+++ b/sal/osl/unx/random.cxx
@@ -8,7 +8,7 @@
*/
#include "system.hxx"
-#include "internal/oslrandom.h"
+#include "oslrandom.h"
#include <assert.h>
diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index 73bb19d61e81..fa8e3f2c216e 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -19,7 +19,7 @@
#include <sal/config.h>
-#include <internal/signalshared.hxx>
+#include <signalshared.hxx>
#include <config_features.h>
diff --git a/sal/osl/w32/backtrace.cxx b/sal/osl/w32/backtrace.cxx
index 750cb15f609a..5095d2053051 100644
--- a/sal/osl/w32/backtrace.cxx
+++ b/sal/osl/w32/backtrace.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "internal/misc.hxx"
+#include "misc.hxx"
#include <windows.h>
#include <process.h>
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index c6e4fb6494ba..97536ce116be 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -34,7 +34,7 @@
#include <osl/mutex.h>
#include <osl/thread.h>
-#include "internal/rtllifecycle.h"
+#include "rtllifecycle.h"
// externals
diff --git a/sal/osl/w32/memory.c b/sal/osl/w32/memory.c
index 279a1681d4e1..1f1a5b516ff0 100644
--- a/sal/osl/w32/memory.c
+++ b/sal/osl/w32/memory.c
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <internal/oslmemory.h>
+#include <oslmemory.h>
#include <malloc.h>
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index cb4c6689876e..fb0eee0514ee 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -19,7 +19,7 @@
#include <sal/config.h>
-#include <internal/signalshared.hxx>
+#include <signalshared.hxx>
/* system headers */
#include "system.h"