diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:49:38 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:49:38 +0000 |
| commit | 56e5ddd806371e30e0de91c454557c4dff43e231 (patch) | |
| tree | 9e7c1011081484e665454e5acc444af2a2f5d109 /bridges | |
| parent | 85ab79d61fd2bf3e5407a41f4137c79a800d648c (diff) | |
INTEGRATION: CWS hr51 (1.3.4); FILE MERGED
2008/06/06 14:01:54 hr 1.3.4.1: #i88947#: Solaris 64 bit support
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx | 4 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/cc5_solaris_sparc64/makefile.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx b/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx index c99fa98fbc77..296bb3cd04f6 100644 --- a/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/cpp2uno.cxx @@ -8,7 +8,7 @@ * * $RCSfile: cpp2uno.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -143,7 +143,7 @@ void call( } bool retconv = rtd != NULL && bridges::cpp_uno::shared::relatesToInterfaceType(rtd); - OSL_ASSERT(!(directRet && retconv)); + OSL_ASSERT(!(directReturn && retconv)); void * retin; void * retout; char retbuf[32]; diff --git a/bridges/source/cpp_uno/cc5_solaris_sparc64/makefile.mk b/bridges/source/cpp_uno/cc5_solaris_sparc64/makefile.mk index 62702950bd9e..94efd7253a2a 100644 --- a/bridges/source/cpp_uno/cc5_solaris_sparc64/makefile.mk +++ b/bridges/source/cpp_uno/cc5_solaris_sparc64/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # # This file is part of OpenOffice.org. # @@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk -.IF "$(COM)" == "C52" && "$(CPUNAME)" == "SPARC64" +.IF "$(COM)" == "C52" && "$(CPU)" == "U" SHL1TARGET = $(TARGET) SHL1OBJS = \ |