summaryrefslogtreecommitdiff
path: root/desktop/win32
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-05 12:59:42 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-05 12:59:42 +0000
commit1cd01c75b2235e7f3c7e75d1aeeb69450592aaa4 (patch)
tree8ad5284afa989cb0f49ae8779fafd9c6d2578165 /desktop/win32
parent02521a1acab864cb2e1293f0ea3c34abddfa5325 (diff)
CWS-TOOLING: integrate CWS jl117_DEV300
2009-02-18 16:23:55 +0100 kso r268240 : #i98983# - auto extension fix. 2009-02-16 15:33:04 +0100 jl r267821 : #i99249# conflict resolution error, unopkg hangs 2009-02-13 15:19:16 +0100 jl r267723 : #i99068# regression: extension description from manifest.xml was not displayed
Diffstat (limited to 'desktop/win32')
-rw-r--r--desktop/win32/source/guistdio/guistdio.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc
index c8170e6948..6ee59c891b 100644
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
@@ -361,7 +361,7 @@ int _tmain( int, _TCHAR ** )
hErrorThread
};
- #ifdef GUISTDIO_KEEPRUNNING
+ #ifdef UNOPKG
dwWaitResult = WaitForMultipleObjects( elementsof(hObjects), hObjects, TRUE, INFINITE );
#else
bool bDetach = false;