sal/inc/internal/misc.hxx | 18 --------------
sal/inc/internal/oslmemory.h | 30 ------------------------
sal/inc/internal/oslrandom.h | 25 --------------------
sal/inc/internal/rtllifecycle.h | 47 --------------------------------------
sal/inc/internal/signalshared.hxx | 44 -----------------------------------
sal/inc/misc.hxx | 18 ++++++++++++++
sal/inc/oslmemory.h | 30 ++++++++++++++++++++++++
sal/inc/oslrandom.h | 25 ++++++++++++++++++++
sal/inc/pch/precompiled_sal.hxx | 2 -
sal/inc/rtllifecycle.h | 47 ++++++++++++++++++++++++++++++++++++++
sal/inc/signalshared.hxx | 44 +++++++++++++++++++++++++++++++++++
sal/osl/all/log.cxx | 2 -
sal/osl/all/signalshared.cxx | 2 -
sal/osl/unx/backtraceapi.cxx | 2 -
sal/osl/unx/memory.cxx | 2 -
sal/osl/unx/random.cxx | 2 -
sal/osl/unx/signal.cxx | 2 -
sal/osl/w32/backtrace.cxx | 2 -
sal/osl/w32/dllentry.c | 2 -
sal/osl/w32/memory.c | 2 -
sal/osl/w32/signal.cxx | 2 -
sal/rtl/alloc_arena.cxx | 2 -
sal/rtl/alloc_cache.cxx | 32 -------------------------
sal/rtl/alloc_fini.cxx | 2 -
sal/rtl/alloc_global.cxx | 4 +--
sal/rtl/locale.cxx | 2 -
sal/rtl/random.cxx | 2 -
27 files changed, 182 insertions(+), 212 deletions(-)
New commits:
commit c5e119f51bd07fb11ac04a58dacf3f79695d02a9
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Apr 7 12:37:56 2016 +0300
Drop pointless "internal" directory level for already internal include files
Change-Id: I496fdbab3e17c806c2d16513412c4c1b9120bc3c
diff --git a/sal/inc/internal/misc.hxx b/sal/inc/misc.hxx
similarity index 100%
rename from sal/inc/internal/misc.hxx
rename to sal/inc/misc.hxx
diff --git a/sal/inc/internal/oslmemory.h b/sal/inc/oslmemory.h
similarity index 100%
rename from sal/inc/internal/oslmemory.h
rename to sal/inc/oslmemory.h
diff --git a/sal/inc/internal/oslrandom.h b/sal/inc/oslrandom.h
similarity index 100%
rename from sal/inc/internal/oslrandom.h
rename to sal/inc/oslrandom.h
diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx
index 13cf7bb..0db8378 100644
--- a/sal/inc/pch/precompiled_sal.hxx
+++ b/sal/inc/pch/precompiled_sal.hxx
@@ -91,6 +91,6 @@
#include <sal/mathconf.h>
#include <sal/saldllapi.h>
#include <sal/types.h>
-#include <internal/rtllifecycle.h>
+#include <rtllifecycle.h>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/internal/rtllifecycle.h b/sal/inc/rtllifecycle.h
similarity index 100%
rename from sal/inc/internal/rtllifecycle.h
rename to sal/inc/rtllifecycle.h
diff --git a/sal/inc/internal/signalshared.hxx b/sal/inc/signalshared.hxx
similarity index 100%
rename from sal/inc/internal/signalshared.hxx
rename to sal/inc/signalshared.hxx
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index a010c33..20efa68 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 f444f37..d4615b3 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 a2a2cac..1895c43 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 c016baa9..db376ec 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 a0fb73c..f9c9775 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 73bb19d..fa8e3f2 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 750cb15..5095d20 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 c6e4fb6..97536ce 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 279a168..1f1a5b5 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 cb4c668..fb0eee05 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"
diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx
index 6a7f740..654cd2f 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 2da4a55..362582f 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 32c6fd5..dd0cb6a 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 1e344f3..6c9b288 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 8274dde..bd232c1 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 1c52935..3168c96 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.
commit 43a31e3a727760cf4cf82cdc19ca4c8dcc8a057d
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Apr 7 12:13:45 2016 +0300
Bin unneeded forward declarations of static functions
The file contains their definitions before they are used anyway.
Change-Id: Iaa541ec9a12e4971c0cd4ba7cfb4790d328b7b63
diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx
index 1241f42..2da4a55 100644
--- a/sal/rtl/alloc_cache.cxx
+++ b/sal/rtl/alloc_cache.cxx
@@ -1286,36 +1286,6 @@ SAL_CALL rtl_cache_free (
}
}
-/* ================================================================= *
- *
- * cache wsupdate (machdep) internals.
- *
- * ================================================================= */
-
-/** rtl_cache_wsupdate_init()
- *
- * @precond g_cache_list.m_lock initialized
- */
-static void
-rtl_cache_wsupdate_init();
-
-/** rtl_cache_wsupdate_wait()
- *
- * @precond g_cache_list.m_lock acquired
- */
-static void
-rtl_cache_wsupdate_wait (
- unsigned int seconds
-);
-
-/** rtl_cache_wsupdate_fini()
- *
- */
-static void
-rtl_cache_wsupdate_fini();
-
-/* ================================================================= */
-
#if defined(SAL_UNX)
void SAL_CALL
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
