diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-10-28 15:27:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-10-28 15:27:12 +0000 |
| commit | ae26fccf42c1b1c5e167291f8d12134da17c46c1 (patch) | |
| tree | bd7296e35c91b7939c54254e03750e980bd73062 /sal | |
| parent | bef6250a558e3bef23f19b318793158c8021f388 (diff) | |
INTEGRATION: CWS valgrind02 (1.2.62); FILE MERGED
2004/10/20 14:36:06 mhu 1.2.62.1: #i35209# Adapted to use SAL_IMPLEMENT_MAIN_WITH_ARGS() macro as recommended.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/rtl/process/child_process.cxx | 14 | ||||
| -rw-r--r-- | sal/qa/rtl/process/child_process_id.cxx | 15 |
2 files changed, 15 insertions, 14 deletions
diff --git a/sal/qa/rtl/process/child_process.cxx b/sal/qa/rtl/process/child_process.cxx index 62166c9144c6..c1152712a332 100644 --- a/sal/qa/rtl/process/child_process.cxx +++ b/sal/qa/rtl/process/child_process.cxx @@ -2,9 +2,9 @@ * * $RCSfile: child_process.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2004-05-03 09:13:58 $ + * last change: $Author: rt $ $Date: 2004-10-28 16:26:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,10 @@ #include <stdio.h> +#ifndef _SAL_MAIN_H_ +#include "sal/main.h" +#endif + #ifndef _RTL_PROCESS_H_ #include <rtl/process.h> #endif @@ -72,11 +76,7 @@ using namespace ::rtl; // ----------------------------------- Main ----------------------------------- -#if (defined UNX) || (defined OS2) -int main( int argc, char *argv[] ) -#else -int _cdecl main( int argc, char* argv[] ) -#endif +SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { printf("# %s is called.\n", argv[0]); diff --git a/sal/qa/rtl/process/child_process_id.cxx b/sal/qa/rtl/process/child_process_id.cxx index d8c6fe62d8a7..646e84cfa16e 100644 --- a/sal/qa/rtl/process/child_process_id.cxx +++ b/sal/qa/rtl/process/child_process_id.cxx @@ -2,9 +2,9 @@ * * $RCSfile: child_process_id.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2004-05-03 09:14:09 $ + * last change: $Author: rt $ $Date: 2004-10-28 16:27:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,10 @@ #include <stdio.h> +#ifndef _SAL_MAIN_H_ +#include "sal/main.h" +#endif + #ifndef _RTL_PROCESS_H_ #include <rtl/process.h> #endif @@ -89,11 +93,8 @@ void printUuid( sal_uInt8 *pNode ) } // ----------------------------------- Main ----------------------------------- -#if (defined UNX) || (defined OS2) -int main( int argc, char *argv[] ) -#else -int _cdecl main( int argc, char* argv[] ) -#endif + +SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { //printf("# %s is called.\n", argv[0]); sal_uInt8 pTargetUUID[16]; |