diff options
| -rw-r--r-- | include/osl/process.h | 9 | ||||
| -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 |
4 files changed, 4 insertions, 26 deletions
diff --git a/include/osl/process.h b/include/osl/process.h index 205e6da1692c..712bb0bd2f82 100644 --- a/include/osl/process.h +++ b/include/osl/process.h @@ -366,15 +366,6 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL osl_getCommandArgCount(void); SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getCommandArg( sal_uInt32 nArg, rtl_uString **strCommandArg); -/** Determine whether or not the command args have already been set. - - Deprecated: This function is only for internal use - - @return The command args are already set, and may not be set again. - @since LibreOffice 4.3 -*/ -SAL_DLLPUBLIC int SAL_CALL osl_areCommandArgsSet (void); - /** Set the command-line arguments as passed to the main-function of this process. Deprecated: This function is only for internal use. Passing the args from main will 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); |