diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-19 11:50:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-19 13:01:34 +0100 |
| commit | 42ab57ca574307e994707ae6625e290e2e0be24e (patch) | |
| tree | 057f52d9c3b6f31996c7ac62b7d7fdade1f14fcb | |
| parent | 061c7dd0837adfe25d31f979465bfe4fa9dbf3a3 (diff) | |
memory.c -> memory.cxx
Change-Id: I87d977aabd09ff01cba0f25247dca43a2bf0dd2b
| -rw-r--r-- | jurt/source/pipe/staticsalhack_c.c | 1 | ||||
| -rw-r--r-- | jurt/source/pipe/staticsalhack_cxx.cxx | 1 | ||||
| -rw-r--r-- | sal/Library_sal.mk | 2 | ||||
| -rw-r--r-- | sal/osl/unx/memory.cxx (renamed from sal/osl/unx/memory.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 ac9a9133e641..7b4a37e59bb5 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/memory.c> #include <sal/osl/unx/mutex.c> #include <sal/osl/unx/nlsupport.c> #include <sal/osl/unx/pipe.c> diff --git a/jurt/source/pipe/staticsalhack_cxx.cxx b/jurt/source/pipe/staticsalhack_cxx.cxx index de023797cba3..c21ed448299f 100644 --- 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> diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 9cb47f83ec8c..a8075cabfcff 100644 --- 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 \ diff --git a/sal/osl/unx/memory.c b/sal/osl/unx/memory.cxx index e9fb9a885533..e9fb9a885533 100644 --- a/sal/osl/unx/memory.c +++ b/sal/osl/unx/memory.cxx |