diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 08:49:57 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 08:49:57 +0000 |
| commit | 8b21a89de45ad185bb0b5ca338309eba79f28d16 (patch) | |
| tree | 52f48e7af23f309eb8d12d989a6204ecfcb75caf /desktop/win32 | |
| parent | 8b2f2a1636f075a74d6716f3a95b51e121388b8c (diff) | |
INTEGRATION: CWS mingwport14 (1.3.10); FILE MERGED
2008/06/21 14:22:13 tono 1.3.10.1: #i90950#: mingw port
Diffstat (limited to 'desktop/win32')
| -rw-r--r-- | desktop/win32/source/unoinfo.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx index 187a38d97d..d4458212c3 100644 --- a/desktop/win32/source/unoinfo.cxx +++ b/desktop/win32/source/unoinfo.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unoinfo.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -81,8 +81,13 @@ void writePath( } +#ifdef __MINGW32__ +int main(int argc, char ** argv, char **) { + if (argc == 2 && strcmp(argv[1], "c++") == 0) { +#else int wmain(int argc, wchar_t ** argv, wchar_t **) { if (argc == 2 && wcscmp(argv[1], L"c++") == 0) { +#endif wchar_t path[MAX_PATH]; wchar_t * pathEnd = getBrandPath(path); if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link")) @@ -102,7 +107,11 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) { exit(EXIT_FAILURE); } writePath(path, pathEnd, MY_STRING(L"\\bin")); +#ifdef __MINGW32__ + } else if (argc == 2 && strcmp(argv[1], "java") == 0) { +#else } else if (argc == 2 && wcscmp(argv[1], L"java") == 0) { +#endif if (fwrite("1", 1, 1, stdout) != 1) { exit(EXIT_FAILURE); } |