summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-11-19 11:51:16 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-11-19 13:01:34 +0100
commit431a7c402f5ba41db1c0acbe264c50da925b05a4 (patch)
tree2e53a367f20fe6d18249270fe352a47df5f2054b
parent42ab57ca574307e994707ae6625e290e2e0be24e (diff)
mutex.c -> mutex.cxx
Change-Id: I24ebffd1b055bdd6ad93d2f071d20480b549379f
-rw-r--r--jurt/source/pipe/staticsalhack_c.c1
-rw-r--r--jurt/source/pipe/staticsalhack_cxx.cxx1
-rw-r--r--sal/Library_sal.mk2
-rw-r--r--sal/osl/unx/mutex.cxx (renamed from sal/osl/unx/mutex.c)0
4 files changed, 2 insertions, 2 deletions
diff --git a/jurt/source/pipe/staticsalhack_c.c b/jurt/source/pipe/staticsalhack_c.c
index 7b4a37e59bb5..2fefa1b32a0f 100644
--- a/jurt/source/pipe/staticsalhack_c.c
+++ b/jurt/source/pipe/staticsalhack_c.c
@@ -9,7 +9,6 @@
#include <staticsalhack.h>
-#include <sal/osl/unx/mutex.c>
#include <sal/osl/unx/nlsupport.c>
#include <sal/osl/unx/pipe.c>
#include <sal/osl/unx/readwrite_helper.c>
diff --git a/jurt/source/pipe/staticsalhack_cxx.cxx b/jurt/source/pipe/staticsalhack_cxx.cxx
index c21ed448299f..cee447d25c40 100644
--- a/jurt/source/pipe/staticsalhack_cxx.cxx
+++ b/jurt/source/pipe/staticsalhack_cxx.cxx
@@ -28,6 +28,7 @@
#include <sal/osl/unx/file_url.cxx>
#include <sal/osl/unx/memory.cxx>
#include <sal/osl/unx/module.cxx>
+#include <sal/osl/unx/mutex.cxx>
#include <sal/osl/unx/process.cxx>
#include <sal/osl/unx/process_impl.cxx>
#include <sal/osl/unx/profile.cxx>
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index a8075cabfcff..b2e4a6f025c3 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -161,6 +161,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/file_volume \
sal/osl/unx/memory \
sal/osl/unx/module \
+ sal/osl/unx/mutex \
sal/osl/unx/process \
sal/osl/unx/process_impl \
sal/osl/unx/profile \
@@ -170,7 +171,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
$(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
))
$(eval $(call gb_Library_add_cobjects,sal,\
- sal/osl/unx/mutex \
sal/osl/unx/nlsupport \
sal/osl/unx/pipe \
sal/osl/unx/readwrite_helper \
diff --git a/sal/osl/unx/mutex.c b/sal/osl/unx/mutex.cxx
index 62f212f15a93..62f212f15a93 100644
--- a/sal/osl/unx/mutex.c
+++ b/sal/osl/unx/mutex.cxx