summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2012-12-04 13:39:52 +0100
committerThorsten Behrens <tbehrens@suse.com>2012-12-04 13:41:18 +0100
commitf4ad79dcc50b0d40fba3b979eb5d59ee8a19dcf0 (patch)
tree8783f7f83db849f3b004352d33bcb364a9c398da /sal
parente9f31eaa49f9494113e72deaf0fe079701844ea4 (diff)
Fixup: putting back dummy methods for removed semaphore
We don't want to change sal SONAME just yet. Change-Id: I3a9de9a53a4ba845c00a26450e281534ca5d97f6
Diffstat (limited to 'sal')
-rw-r--r--sal/Library_sal.mk1
-rw-r--r--sal/osl/all/semaphor.c43
-rw-r--r--sal/util/sal.map5
3 files changed, 49 insertions, 0 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 72234a9d1e3f..51823fe7bee3 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -138,6 +138,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
))
$(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/all/filepath \
+ sal/osl/all/semaphor \
))
ifeq ($(OS),IOS)
diff --git a/sal/osl/all/semaphor.c b/sal/osl/all/semaphor.c
new file mode 100644
index 000000000000..5afb950ad280
--- /dev/null
+++ b/sal/osl/all/semaphor.c
@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <sal/types.h>
+
+// Stubs for removed functionality, to be killed when we bump sal SONAME
+
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL osl_createSemaphore(sal_uInt32 dummy)
+{
+ (void)dummy;
+ return NULL;
+}
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL osl_destroySemaphore(void* dummy)
+{
+ (void)dummy;
+}
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_acquireSemaphore(void* dummy)
+{
+ (void)dummy;
+ return sal_False;
+}
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_tryToAcquireSemaphore(void* dummy)
+{
+ (void)dummy;
+ return sal_False;
+}
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_releaseSemaphore(void* dummy)
+{
+ (void)dummy;
+ return sal_False;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 47dfe39897bd..3c5e787ed35a 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -25,6 +25,7 @@ UDK_3_0_0 {
osl_acquireSocket;
osl_acquirePipe;
osl_acquireMutex;
+ osl_acquireSemaphore;
osl_addSignalHandler;
osl_addToSocketSet;
osl_assertFailedLine;
@@ -46,6 +47,7 @@ UDK_3_0_0 {
osl_createInetSocketAddr;
osl_createMutex;
osl_createPipe;
+ osl_createSemaphore;
osl_createSocket;
osl_createSocketSet;
osl_createSuspendedThread;
@@ -56,6 +58,7 @@ UDK_3_0_0 {
osl_destroyCondition;
osl_destroyHostAddr;
osl_destroyMutex;
+ osl_destroySemaphore;
osl_destroySocketAddr;
osl_destroySocketSet;
osl_destroyThread;
@@ -141,6 +144,7 @@ UDK_3_0_0 {
osl_releaseDirectoryItem;
osl_releaseMutex;
osl_releasePipe;
+ osl_releaseSemaphore;
osl_releaseSocket;
osl_removeFromSocketSet;
osl_removeProfileEntry;
@@ -169,6 +173,7 @@ UDK_3_0_0 {
osl_terminateThread;
osl_trace;
osl_tryToAcquireMutex;
+ osl_tryToAcquireSemaphore;
osl_unloadModule;
osl_waitCondition;
osl_waitThread;