Kaydet (Commit) e5111574 authored tarafından Michael Meeks's avatar Michael Meeks

Revert "sb140: sb140: #i116981# clean up memory upon exit"

This reverts commit 2d5dd9a9.

Conflicts:
	sal/inc/rtl/bootstrap.h
	sal/rtl/source/bootstrap.cxx
üst 1e8728c4
...@@ -124,8 +124,7 @@ extern "C" { ...@@ -124,8 +124,7 @@ extern "C" {
If it is never called, the filename is based on the name of the executable, If it is never called, the filename is based on the name of the executable,
with the suffix ".ini" on Windows or "rc" on Unix. with the suffix ".ini" on Windows or "rc" on Unix.
@param pFileUri URL of the ini file; must not be null, must not be the empty @param pNameUri URL of the inifile with path but WITHOUT suffix (.ini or rc)
string
*/ */
SAL_DLLPUBLIC void SAL_CALL rtl_bootstrap_setIniFileName( rtl_uString *pFileUri ) SAL_DLLPUBLIC void SAL_CALL rtl_bootstrap_setIniFileName( rtl_uString *pFileUri )
SAL_THROW_EXTERN_C(); SAL_THROW_EXTERN_C();
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment