strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS mingwport14 (1.3.10); FILE MERGED

Browse source 
2008/06/21 14:22:13 tono 1.3.10.1: #i90950#: mingw port
This commit is contained in:
Vladimir Glazounov 2008-07-02 08:49:57 +00:00
parent e042a9dfc5
commit 65b25dcbc4
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
desktop/win32/source/unoinfo.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: unoinfo.cxx,v $ * $RCSfile: unoinfo.cxx,v $
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* This file is part of OpenOffice.org. * 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 **) { int wmain(int argc, wchar_t ** argv, wchar_t **) {
if (argc == 2 && wcscmp(argv[1], L"c++") == 0) { if (argc == 2 && wcscmp(argv[1], L"c++") == 0) {
#endif
wchar_t path[MAX_PATH]; wchar_t path[MAX_PATH];
wchar_t * pathEnd = getBrandPath(path); wchar_t * pathEnd = getBrandPath(path);
if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link")) 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); exit(EXIT_FAILURE);
} }
writePath(path, pathEnd, MY_STRING(L"\\bin")); 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) { } else if (argc == 2 && wcscmp(argv[1], L"java") == 0) {
#endif
if (fwrite("1", 1, 1, stdout) != 1) { if (fwrite("1", 1, 1, stdout) != 1) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }