[ooo-build-commit] Branch 'ooo/master' - 2 commits - cosv/source odk/source

[Jan Holesovsky]

 cosv/source/storage/file.cxx         |    5 ++++-
 odk/source/unowinreg/win/makefile.mk |    9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit d3b129845d99d9ac795d678c046babea94e7dd58
Author: Vladimir Glazounov <vg at openoffice.org>
Date:   Wed Aug 26 14:24:27 2009 +0000

    CWS-TOOLING: integrate CWS mh132
    2009-08-06 12:20:52 +0200 mh  r274712 : corrected error handling
    2009-08-05 13:41:20 +0200 mh  r274661 : #i93040# NetBSD compile issue
    2009-08-05 13:40:32 +0200 mh  r274660 : #i93040# NetBSD compile issue
    2009-08-05 13:38:46 +0200 mh  r274659 : #i93040# NetBSD compile issue
    2009-08-05 13:29:15 +0200 mh  r274658 : #i95193# increase includes limit
    2009-08-05 13:22:07 +0200 mh  r274657 : #i96811# honor return values of read calls
    2009-08-05 13:16:47 +0200 mh  r274654 : #i96802# honor return values of write calls
    2009-08-05 13:07:06 +0200 mh  r274653 : #i99835# do DestroyData
    2009-08-05 13:01:42 +0200 mh  r274651 : #i68557#: allow more dpi resolutions in scanner dialogue
    2009-07-24 14:46:04 +0200 mh  r274307 : #i103770# missing fclose added

diff --git a/cosv/source/storage/file.cxx b/cosv/source/storage/file.cxx
index e515fa2..c376a7e 100644
--- a/cosv/source/storage/file.cxx
+++ b/cosv/source/storage/file.cxx
@@ -122,7 +122,10 @@ File::do_read( void *	       out_pDest,
     if ( eLastIO == io_write )
         ::fseek( pStream, 0, SEEK_CUR );
     uintt ret = position();
-    ::fread( out_pDest, 1, i_nNrofBytes, pStream );
+    int iRet= ::fread( out_pDest, 1, i_nNrofBytes, pStream );
+    if ( iRet < 0  )  {
+    fprintf(stderr, "warning: read failed in %s line %d \n", __FILE__, __LINE__);
+    }
     ret = position() - ret;
 
     eLastIO = io_read;
commit 3dad033ee25dc4209d62e5567fcdaa01d4b389b1
Author: Vladimir Glazounov <vg at openoffice.org>
Date:   Wed Aug 26 06:36:38 2009 +0000

    CWS-TOOLING: integrate CWS mingwport22
    2009-08-19 16:18:46 +0200 tono  r275156 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
    2009-08-05 12:27:41 +0200 tono  r274650 : CWS-TOOLING: rebase CWS mingwport22 to trunk at 274622 (milestone: DEV300:m54)
    2009-08-01 00:56:35 +0200 tono  r274552 : i#103795: mingw gcc-4.4.0 port: use gcc dll
    2009-07-27 00:13:27 +0200 tono  r274344 : i#103795: mingw gcc-4.4.0 port: use gcc dll
    2009-07-25 06:19:59 +0200 tono  r274332 : i#103803: mingw gcc-4.4.0 port: invalid "extern static"
    2009-07-25 06:13:56 +0200 tono  r274331 : i#103802: mingw gcc-4.4.0 port: inhibit use of pthread
    2009-07-25 06:05:22 +0200 tono  r274330 : i#103801: mingw gcc-4.4.0 port: specify relocatable data section
    2009-07-25 05:54:09 +0200 tono  r274329 : i#103800: mingw gcc-4.4.0 port: remove invalid scope
    2009-07-25 05:44:58 +0200 tono  r274328 : i#103799: mingw gcc-4.4.0 port: add some #include
    2009-07-25 05:33:09 +0200 tono  r274327 : i#103798: mingw gcc-4.4.0 port: add backward in include path
    2009-07-25 05:24:42 +0200 tono  r274326 : i#103797: mingw gcc-4.4.0 port: nooptimize c++-uno bridge
    2009-07-25 05:16:20 +0200 tono  r274325 : i#103795: mingw gcc-4.4.0 port: use gcc dll
    2009-07-25 04:01:59 +0200 tono  r274324 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
    2009-07-25 02:44:01 +0200 tono  r274322 : i#103793: mingw port: Exclude msvc[pr]80.dll from packaging
    2009-07-25 02:28:21 +0200 tono  r274321 : i#103791: mingw port fix typo

diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk
index 026e66f..7c826dd 100644
--- a/odk/source/unowinreg/win/makefile.mk
+++ b/odk/source/unowinreg/win/makefile.mk
@@ -95,10 +95,13 @@ SHL1TARGET=$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
 
 #No default libraries
-.IF "$(COM)"=="GCC"
-STDSHL=-lmingw32 -lmsvcrt
-.ELSE
 STDSHL=
+.IF "$(COM)"=="GCC"
+SHL1STDLIBS += -lstdc++
+.IF "$(MINGW_GCCLIB_EH)"=="YES"
+SHL1STDLIBS += -lgcc_eh
+.ENDIF
+SHL1STDLIBS += -lgcc -lmingw32 -lmoldname -lmsvcrt
 .ENDIF
 
 SHL1STDLIBS +=\