memory.c -> memory.cxx

Change-Id: I87d977aabd09ff01cba0f25247dca43a2bf0dd2b

memory.c -> memory.cxx
Change-Id: I87d977aabd09ff01cba0f25247dca43a2bf0dd2b
42ab57ca · Stephan Bergmann · 061c7dd0 · 42ab57ca · 42ab57ca · 42ab57ca
Kaydet (Commit) 42ab57ca authored Kas 19, 2014 tarafından Stephan Bergmann
Showing with 2 additions and 2 deletions

staticsalhack_c.c jurt/source/pipe/staticsalhack_c.c +0 -1

staticsalhack_cxx.cxx jurt/source/pipe/staticsalhack_cxx.cxx +1 -0

Library_sal.mk sal/Library_sal.mk +1 -1

memory.cxx sal/osl/unx/memory.cxx +0 -0

No files found.
--- 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/memory.c>
 #include <sal/osl/unx/mutex.c>
 #include <sal/osl/unx/nlsupport.c>
 #include <sal/osl/unx/pipe.c>

--- a/jurt/source/pipe/staticsalhack_cxx.cxx
+++ b/jurt/source/pipe/staticsalhack_cxx.cxx
@@ -26,6 +26,7 @@
 #include <sal/osl/unx/file_path_helper.cxx>
 #include <sal/osl/unx/file_stat.cxx>
 #include <sal/osl/unx/file_url.cxx>
+#include <sal/osl/unx/memory.cxx>
 #include <sal/osl/unx/module.cxx>
 #include <sal/osl/unx/process.cxx>
 #include <sal/osl/unx/process_impl.cxx>

--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -159,6 +159,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/osl/unx/file_stat \
 	sal/osl/unx/file_url \
 	sal/osl/unx/file_volume \
+	sal/osl/unx/memory \
 	sal/osl/unx/module \
 	sal/osl/unx/process \
 	sal/osl/unx/process_impl \
@@ -169,7 +170,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/memory \
 	sal/osl/unx/mutex \
 	sal/osl/unx/nlsupport \
 	sal/osl/unx/pipe \

--- a/sal/osl/unx/memory.c
+++ b/sal/osl/unx/memory.c