diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-10-28 15:24:18 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-10-28 15:24:18 +0000 |
| commit | fca948fc5879bdb443d150ffd604a0e467c81172 (patch) | |
| tree | 6114ad6f81fade7b902876123b37ada98ad47cf0 /jvmfwk | |
| parent | ed3e441168b718e0f50c80bded3af3d5ea172ac5 (diff) | |
INTEGRATION: CWS valgrind02 (1.5.14); FILE MERGED
2004/10/11 17:26:26 mhu 1.5.14.1: #i35209# Adapted to use SAL_IMPLEMENT_MAIN_WITH_ARGS() macro instead of plain main() function.
Diffstat (limited to 'jvmfwk')
| -rwxr-xr-x | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 16d6282f4c07..fca2c9974d37 100755 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -2,9 +2,9 @@ * * $RCSfile: javaldx.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2004-07-23 11:49:55 $ + * last change: $Author: rt $ $Date: 2004-10-28 16:24:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,17 +58,17 @@ * * ************************************************************************/ + #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "osl/thread.h" +#include "sal/main.h" #include "sal/types.h" +#include "osl/thread.h" #include "rtl/ustring.hxx" #include "rtl/byteseq.hxx" #include "jvmfwk/framework.h" - - using namespace rtl; #define OUSTR(x) OUString(RTL_CONSTASCII_USTRINGPARAM( x )) @@ -87,7 +87,7 @@ static rtl::OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData); "--help or -h\n" -int main(int argc, char **argv) +SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { if( hasOption("--help",argc, argv) || hasOption("-h", argc, argv)) { |