diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-04 15:52:03 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-04 15:56:17 +0100 |
| commit | 0a40d6c3abba6f005e1b7806919e5169e032f985 (patch) | |
| tree | 8989e7a614024d90d43255b65d7ea8a73b29dbe2 /sal | |
| parent | 7fbfc12474b85b31c9d120898fff6e226d76d662 (diff) | |
[API CHANGE] Remove osl_setCommandArgs
...it was added late in the LO 3.3 cycle apparently by error.
While this is strictly speaking an incompatible change, no client code should
ever have called this deprecated, internal functionality anyway. An aborting
stub is left in place for soname stability.
Change-Id: Ibbc96ccf76a07a80d732a0713c95ff7b6bf1e528
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/all/compat.cxx | 4 | ||||
| -rw-r--r-- | sal/osl/unx/process_impl.cxx | 8 | ||||
| -rw-r--r-- | sal/osl/w32/process.cxx | 9 |
3 files changed, 4 insertions, 17 deletions
diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx index ef44215b00ed..3f072a11023d 100644 --- a/sal/osl/all/compat.cxx +++ b/sal/osl/all/compat.cxx @@ -23,6 +23,10 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_acquireSemaphore(void *) { for (;;) { std::abort(); } // avoid "must return a value" warnings } +SAL_DLLPUBLIC_EXPORT int SAL_CALL osl_areCommandArgsSet() { + for (;;) { std::abort(); } // avoid "must return a value" warnings +} + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_assertFailedLine( char const *, sal_Int32, char const *) { diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index b5c1fe76fb9c..62f2f78b5e89 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -190,14 +190,6 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32 nArg, rtl_uString ** strC return (result); } -int SAL_CALL osl_areCommandArgsSet (void) -{ - pthread_mutex_lock (&(g_command_args.m_mutex)); - int nRet = (int) (g_command_args.m_nCount > 0); - pthread_mutex_unlock (&(g_command_args.m_mutex)); - return nRet; -} - /*************************************** osl_setCommandArgs(). **************************************/ diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx index 0ab85800704d..087ee2e20c01 100644 --- a/sal/osl/w32/process.cxx +++ b/sal/osl/w32/process.cxx @@ -361,15 +361,6 @@ oslProcessError SAL_CALL osl_getCommandArg( sal_uInt32 nArg, rtl_uString **strCo /***************************************************************************/ -int SAL_CALL osl_areCommandArgsSet(void) -{ - osl_acquireMutex (*osl_getGlobalMutex()); - int nRet = (int) (g_command_args.m_nCount > 0); - osl_releaseMutex (*osl_getGlobalMutex()); - return nRet; -} - - void SAL_CALL osl_setCommandArgs (int argc, char ** argv) { assert(argc > 0); |