summaryrefslogtreecommitdiff
path: root/sal/rtl
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/rtl
parent43a31e3a727760cf4cf82cdc19ca4c8dcc8a057d (diff)
Drop pointless "internal" directory level for already internal include files
Change-Id: I496fdbab3e17c806c2d16513412c4c1b9120bc3c
Diffstat (limited to 'sal/rtl')
-rw-r--r--sal/rtl/alloc_arena.cxx2
-rw-r--r--sal/rtl/alloc_cache.cxx2
-rw-r--r--sal/rtl/alloc_fini.cxx2
-rw-r--r--sal/rtl/alloc_global.cxx4
-rw-r--r--sal/rtl/locale.cxx2
-rw-r--r--sal/rtl/random.cxx2
6 files changed, 7 insertions, 7 deletions
diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx
index 6a7f7405b852..654cd2f1dbfa 100644
--- a/sal/rtl/alloc_arena.cxx
+++ b/sal/rtl/alloc_arena.cxx
@@ -20,7 +20,7 @@
#include "alloc_arena.hxx"
#include "alloc_impl.hxx"
-#include "internal/rtllifecycle.h"
+#include "rtllifecycle.h"
#include "sal/macros.h"
#include "osl/diagnose.h"
diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx
index 2da4a55f0ddc..362582fe849f 100644
--- a/sal/rtl/alloc_cache.cxx
+++ b/sal/rtl/alloc_cache.cxx
@@ -20,7 +20,7 @@
#include "alloc_cache.hxx"
#include "alloc_impl.hxx"
#include "alloc_arena.hxx"
-#include "internal/rtllifecycle.h"
+#include "rtllifecycle.h"
#include "sal/macros.h"
#include "osl/diagnose.h"
#include <osl/thread.hxx>
diff --git a/sal/rtl/alloc_fini.cxx b/sal/rtl/alloc_fini.cxx
index 32c6fd5a5996..dd0cb6a52c94 100644
--- a/sal/rtl/alloc_fini.cxx
+++ b/sal/rtl/alloc_fini.cxx
@@ -19,7 +19,7 @@
#include <rtl/instance.hxx>
-#include "internal/rtllifecycle.h"
+#include "rtllifecycle.h"
namespace
{
diff --git a/sal/rtl/alloc_global.cxx b/sal/rtl/alloc_global.cxx
index 1e344f38b3a3..6c9b2888e0c4 100644
--- a/sal/rtl/alloc_global.cxx
+++ b/sal/rtl/alloc_global.cxx
@@ -26,8 +26,8 @@
#include <string.h>
#include <stdio.h>
-#include "internal/rtllifecycle.h"
-#include <internal/oslmemory.h>
+#include "rtllifecycle.h"
+#include <oslmemory.h>
AllocMode alloc_mode = AMode_UNSET;
diff --git a/sal/rtl/locale.cxx b/sal/rtl/locale.cxx
index 8274dde80099..bd232c1a768a 100644
--- a/sal/rtl/locale.cxx
+++ b/sal/rtl/locale.cxx
@@ -22,7 +22,7 @@
#include "osl/diagnose.h"
#include "rtl/alloc.h"
-#include "internal/rtllifecycle.h"
+#include "rtllifecycle.h"
static const sal_Int32 RTL_HASHTABLE_SIZE[] =
{
diff --git a/sal/rtl/random.cxx b/sal/rtl/random.cxx
index 1c52935fa9eb..3168c9686e28 100644
--- a/sal/rtl/random.cxx
+++ b/sal/rtl/random.cxx
@@ -24,7 +24,7 @@
#include <rtl/alloc.h>
#include <rtl/digest.h>
#include <rtl/random.h>
-#include "internal/oslrandom.h"
+#include "oslrandom.h"
/*========================================================================
*
* rtlRandom internals.