avmedia/source/vlc/wrapper/Types.hxx | 3 +++
include/sal/config.h | 2 --
jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c | 4 ++++
jurt/source/pipe/wrapper/wrapper.c | 1 +
sal/osl/all/signalshared.cxx | 2 ++
sal/osl/unx/salinit.cxx | 1 +
sal/osl/w32/signal.cxx | 3 +++
sal/rtl/hash.cxx | 4 ++++
tools/source/reversemap/bestreversemap.cxx | 1 +
9 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 0b14c0fbef7a6d3420e8da6ae44488b23de4c4fb
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jan 18 15:34:41 2018 +0100
Remove stdlib.h from sal/config.h
This reverts 5da3337c007e0572028283d70bad43e9a29d45c1 "readded include
stdlib.h,
because of missing NULL definition in many headers, #100000, #101685",
which is
no longer relevant.
Change-Id: I544ed9a7afbf7b611bc481b8d50acca3193d93de
Reviewed-on: https://gerrit.libreoffice.org/48131
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/avmedia/source/vlc/wrapper/Types.hxx
b/avmedia/source/vlc/wrapper/Types.hxx
index 7411b03dc95a..eb5dd3a4f9d4 100644
--- a/avmedia/source/vlc/wrapper/Types.hxx
+++ b/avmedia/source/vlc/wrapper/Types.hxx
@@ -12,9 +12,12 @@
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_TYPES_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_TYPES_HXX
+#include <sal/config.h>
+
#if defined(_WIN32)
typedef __int64 libvlc_time_t;
#else
+#include <stdint.h>
typedef int64_t libvlc_time_t;
#endif
diff --git a/include/sal/config.h b/include/sal/config.h
index 03a2f5b9fa21..bfe4d5e2d3e2 100644
--- a/include/sal/config.h
+++ b/include/sal/config.h
@@ -24,8 +24,6 @@
#include <android/compatibility.hxx>
#endif
-#include <stdlib.h>
-
#ifdef _WIN32
#define SAL_W32
#define SAL_DLLEXTENSION ".dll"
diff --git
a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
index ba775da069d0..5259bbcd5474 100644
--- a/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
+++ b/jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <stdlib.h>
+
#include <jni.h>
#include <osl/security.h>
#include <osl/pipe.h>
diff --git a/jurt/source/pipe/wrapper/wrapper.c
b/jurt/source/pipe/wrapper/wrapper.c
index aefaa3719183..28d16690b54e 100644
--- a/jurt/source/pipe/wrapper/wrapper.c
+++ b/jurt/source/pipe/wrapper/wrapper.c
@@ -20,6 +20,7 @@
#include <sal/config.h>
#include <stddef.h>
+#include <stdlib.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
diff --git a/sal/osl/all/signalshared.cxx b/sal/osl/all/signalshared.cxx
index 9cf7fafc2de5..d6998eb006ca 100644
--- a/sal/osl/all/signalshared.cxx
+++ b/sal/osl/all/signalshared.cxx
@@ -19,6 +19,8 @@
#include <sal/config.h>
+#include <stdlib.h>
+
#include <signalshared.hxx>
#include <osl/diagnose.h>
diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index 5e95c2bab532..bfec16a96677 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -37,6 +37,7 @@
#include <salusesyslog.hxx>
#if HAVE_SYSLOG_H
+#include <stdlib.h>
#include <string.h>
#include <syslog.h>
#endif
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index 5f11b8a6bcf6..79d0bcbd4e03 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -18,6 +18,9 @@
*/
#include <sal/config.h>
+
+#include <stdlib.h>
+
#include <config_features.h>
#include <signalshared.hxx>
diff --git a/sal/rtl/hash.cxx b/sal/rtl/hash.cxx
index 0dc36a4cffff..1599343bde3a 100644
--- a/sal/rtl/hash.cxx
+++ b/sal/rtl/hash.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <stdlib.h>
+
#include "hash.hxx"
#include "strimp.hxx"
#include <osl/diagnose.h>
diff --git a/tools/source/reversemap/bestreversemap.cxx
b/tools/source/reversemap/bestreversemap.cxx
index 97691b3dd0eb..a03711abbdfc 100644
--- a/tools/source/reversemap/bestreversemap.cxx
+++ b/tools/source/reversemap/bestreversemap.cxx
@@ -10,6 +10,7 @@
#include <sal/config.h>
#include <rtl/textcvt.h>
+#include <cstdlib>
#include <stdio.h>
struct Encoder
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
