diff options
| author | Christina Rossmanith <ChrRossmanith@web.de> | 2011-05-24 20:40:26 +0200 |
|---|---|---|
| committer | Christina Rossmanith <ChrRossmanith@web.de> | 2011-06-03 17:45:43 +0200 |
| commit | 6a9ac34b469b2f7f7df8a9be7e00944c8871322d (patch) | |
| tree | 0ce08bd121b3c0452b4e9bb1b79e2ada4fdbfef6 /extensions | |
| parent | d32db65e8ffb848e23d6521550aeaa3f210fe9de (diff) | |
__cdecl -> SAL_CALL
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/update/tools/ztool.cxx | 6 | ||||
| -rw-r--r-- | extensions/test/ole/OleClient/clientTest.cxx | 2 | ||||
| -rw-r--r-- | extensions/test/ole/OleConverterVar1/convTest.cxx | 2 | ||||
| -rw-r--r-- | extensions/test/ole/cppToUno/testcppuno.cxx | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/extensions/source/update/tools/ztool.cxx b/extensions/source/update/tools/ztool.cxx index fbcf02e66a65..78b7186dd089 100644 --- a/extensions/source/update/tools/ztool.cxx +++ b/extensions/source/update/tools/ztool.cxx @@ -37,11 +37,7 @@ void show_usage() fputs("ztool usage: ztool <source> <dest>\n", stderr); } -int -#ifdef WNT -__cdecl -#endif -main( int argc, char **argv ) +int SAL_CALL main( int argc, char **argv ) { if ( argc != 3 ) { diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx index fe780c7a2ecc..388a902afa94 100644 --- a/extensions/test/ole/OleClient/clientTest.cxx +++ b/extensions/test/ole/OleClient/clientTest.cxx @@ -82,7 +82,7 @@ void printResultVariantArray( VARIANT & var); void printVariant( VARIANT & var); void printSequence( Sequence<Any>& val); -extern "C" int __cdecl main( int , char **) +extern "C" int SAL_CALL main( int , char **) { HRESULT hr; if( FAILED( hr=CoInitialize(NULL))) diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx b/extensions/test/ole/OleConverterVar1/convTest.cxx index c9955d40d169..e430ad225f7c 100644 --- a/extensions/test/ole/OleConverterVar1/convTest.cxx +++ b/extensions/test/ole/OleConverterVar1/convTest.cxx @@ -74,7 +74,7 @@ void printVariant( VARIANT & var); -int __cdecl _tmain( int argc, _TCHAR * argv[] ) +int SAL_CALL _tmain( int argc, _TCHAR * argv[] ) { HRESULT hr; if( FAILED( hr=CoInitialize(NULL))) diff --git a/extensions/test/ole/cppToUno/testcppuno.cxx b/extensions/test/ole/cppToUno/testcppuno.cxx index 80d93dfb731c..42210be75ecb 100644 --- a/extensions/test/ole/cppToUno/testcppuno.cxx +++ b/extensions/test/ole/cppToUno/testcppuno.cxx @@ -61,7 +61,7 @@ bool incrementMultidimensionalIndex( const sal_Int32 * parDimensionLengths, sal_Int32 * parMultidimensionalIndex); -int __cdecl _tmain( int /*argc*/, _TCHAR * /*argv[]*/ ) +int SAL_CALL _tmain( int /*argc*/, _TCHAR * /*argv[]*/ ) { HRESULT hr; if( FAILED( hr=CoInitialize(NULL))) |