summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/w32/file.cxx2
-rw-r--r--sal/osl/w32/file_dirvol.cxx14
-rw-r--r--sal/osl/w32/module.cxx4
-rw-r--r--sal/osl/w32/path_helper.cxx2
-rw-r--r--sal/osl/w32/path_helper.hxx2
-rw-r--r--sal/osl/w32/profile.cxx4
-rw-r--r--sal/osl/w32/security.cxx4
-rw-r--r--sal/osl/w32/thread.cxx2
-rw-r--r--sal/osl/w32/thread.hxx2
9 files changed, 18 insertions, 18 deletions
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 158e58c54d40..1a08315742ba 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -659,7 +659,7 @@ oslFileError FileHandle_Impl::syncFile()
return result;
}
-extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle(
+extern "C" oslFileHandle osl_createFileHandleFromOSHandle(
HANDLE hFile,
sal_uInt32 uFlags)
{
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 3ef290140a0a..d59932e315fc 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -490,7 +490,7 @@ static oslFileError osl_openLocalRoot(
return error;
}
-static oslFileError SAL_CALL osl_openFileDirectory(
+static oslFileError osl_openFileDirectory(
rtl_uString *strDirectoryPath, oslDirectory *pDirectory)
{
oslFileError error = osl_File_E_None;
@@ -542,7 +542,7 @@ static oslFileError SAL_CALL osl_openFileDirectory(
return error;
}
-static oslFileError SAL_CALL osl_openNetworkServer(
+static oslFileError osl_openNetworkServer(
rtl_uString *strSysDirPath, oslDirectory *pDirectory)
{
NETRESOURCEW aNetResource;
@@ -757,7 +757,7 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString *strDirectoryPath, oslDirect
return error;
}
-static oslFileError SAL_CALL osl_getNextNetResource(
+static oslFileError osl_getNextNetResource(
oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/ )
{
Directory_Impl *pDirImpl = static_cast<Directory_Impl *>(Directory);
@@ -802,7 +802,7 @@ static oslFileError SAL_CALL osl_getNextNetResource(
}
}
-static oslFileError SAL_CALL osl_getNextDrive(
+static oslFileError osl_getNextDrive(
oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/ )
{
Directory_Impl *pDirImpl = static_cast<Directory_Impl *>(Directory);
@@ -843,7 +843,7 @@ static oslFileError SAL_CALL osl_getNextDrive(
}
}
-static oslFileError SAL_CALL osl_getNextFileItem(
+static oslFileError osl_getNextFileItem(
oslDirectory Directory, oslDirectoryItem *pItem, sal_uInt32 /*uHint*/)
{
Directory_Impl *pDirImpl = static_cast<Directory_Impl *>(Directory);
@@ -1434,7 +1434,7 @@ oslFileError SAL_CALL osl_getVolumeInformation(
return osl_File_E_None;
}
-static oslFileError SAL_CALL osl_getDriveInfo(
+static oslFileError osl_getDriveInfo(
oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask)
{
DirectoryItem_Impl *pItemImpl = static_cast<DirectoryItem_Impl *>(Item);
@@ -1532,7 +1532,7 @@ static oslFileError SAL_CALL osl_getDriveInfo(
return osl_File_E_None;
}
-static oslFileError SAL_CALL osl_getServerInfo(
+static oslFileError osl_getServerInfo(
oslDirectoryItem Item, oslFileStatus *pStatus, sal_uInt32 uFieldMask )
{
DirectoryItem_Impl *pItemImpl = static_cast<DirectoryItem_Impl *>(Item);
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 1a88d5cae888..943e215e206b 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -226,7 +226,7 @@ typedef BOOL (WINAPI *SymGetModuleInfo_PROC)(
BTW: We are using ANSI function because not all version of IMAGEHLP.DLL contain Unicode support
*/
-static bool SAL_CALL osl_addressGetModuleURL_NT4_( void *pv, rtl_uString **pustrURL )
+static bool osl_addressGetModuleURL_NT4_( void *pv, rtl_uString **pustrURL )
{
bool bSuccess = false; /* Assume failure */
@@ -329,7 +329,7 @@ typedef BOOL (WINAPI *GetModuleInformation_PROC)(
/* This version can fail because PSAPI.DLL is not always part of NT 4 despite MSDN Library 6.0a say so */
-static bool SAL_CALL osl_addressGetModuleURL_NT_( void *pv, rtl_uString **pustrURL )
+static bool osl_addressGetModuleURL_NT_( void *pv, rtl_uString **pustrURL )
{
bool bSuccess = false; /* Assume failure */
static HMODULE hModPsapi = nullptr;
diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx
index c9fb14b00a94..53e0ae0b19a2 100644
--- a/sal/osl/w32/path_helper.cxx
+++ b/sal/osl/w32/path_helper.cxx
@@ -46,7 +46,7 @@ void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath)
"osl_systemPathEnsureSeparator: Post condition failed");
}
-void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
+void osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath)
{
rtl::OUString path(*ppustrPath);
diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index 31c245ac868c..0210791f401f 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -42,7 +42,7 @@ void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath);
if the path is not the root path '\'
*/
-void SAL_CALL osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath);
+void osl_systemPathRemoveSeparator(/*inout*/ rtl_uString** ppustrPath);
/**
Returns whether a given path is only a logical drive pattern or not.
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index e9d573411d64..96dc7fcdbcec 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -155,7 +155,7 @@ static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl*);
static bool osl_ProfileSwapProfileNames(osl_TProfileImpl*);
static rtl_uString* osl_ProfileGenerateExtension(rtl_uString* ustrFileName, rtl_uString* ustrExtension);
-static bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName);
+static bool osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName);
oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flags)
{
@@ -754,7 +754,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile, const sal_C
return n;
}
-bool SAL_CALL osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName)
+bool osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName)
{
bool bFailed;
::osl::LongPathBuffer< sal_Unicode > aFile( MAX_LONG_PATH );
diff --git a/sal/osl/w32/security.cxx b/sal/osl/w32/security.cxx
index 77bce5d9bbbc..0c086cd5c7bf 100644
--- a/sal/osl/w32/security.cxx
+++ b/sal/osl/w32/security.cxx
@@ -70,7 +70,7 @@ static bool GetSpecialFolder(rtl_uString **strPath,int nFolder);
// We use LPCTSTR here, because we use it with SE_foo_NAME constants
// which are defined in winnt.h as UNICODE-dependent TEXT("PrivilegeName")
static BOOL Privilege(LPCTSTR pszPrivilege, BOOL bEnable);
-static bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **strName, bool bIncludeDomain);
+static bool getUserNameImpl(oslSecurity Security, rtl_uString **strName, bool bIncludeDomain);
oslSecurity SAL_CALL osl_getCurrentSecurity(void)
{
@@ -747,7 +747,7 @@ static BOOL Privilege(LPCTSTR strPrivilege, BOOL bEnable)
return TRUE;
}
-static bool SAL_CALL getUserNameImpl(oslSecurity Security, rtl_uString **strName, bool bIncludeDomain)
+static bool getUserNameImpl(oslSecurity Security, rtl_uString **strName, bool bIncludeDomain)
{
if (Security != nullptr)
{
diff --git a/sal/osl/w32/thread.cxx b/sal/osl/w32/thread.cxx
index 1c2e9894956b..1e347dc3ebd5 100644
--- a/sal/osl/w32/thread.cxx
+++ b/sal/osl/w32/thread.cxx
@@ -425,7 +425,7 @@ static void RemoveKeyFromList( PTLS pTls )
}
}
-void SAL_CALL osl_callThreadKeyCallbackOnThreadDetach(void)
+void osl_callThreadKeyCallbackOnThreadDetach(void)
{
PTLS pTls;
diff --git a/sal/osl/w32/thread.hxx b/sal/osl/w32/thread.hxx
index 542c7b4da673..c7455aab8b0c 100644
--- a/sal/osl/w32/thread.hxx
+++ b/sal/osl/w32/thread.hxx
@@ -14,7 +14,7 @@
#include <sal/types.h>
-void SAL_CALL osl_callThreadKeyCallbackOnThreadDetach(void);
+void osl_callThreadKeyCallbackOnThreadDetach(void);
extern DWORD g_dwTLSTextEncodingIndex;
generated by cgit (git 2.34.1) at 2024-07-01 00:28:27 +0000