diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 08:05:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 08:05:58 +0000 |
| commit | 4ca5c503bc36f0300bb3f3ec1577ed41df098ab2 (patch) | |
| tree | 0e6a4a4fddafd0cafd18601f5345e371c7fe1f99 /registry/workben | |
| parent | c490a9f0684dd5cc7efd897afbf70e2f73444f72 (diff) | |
CWS-TOOLING: integrate CWS jsc311
Diffstat (limited to 'registry/workben')
| -rw-r--r-- | registry/workben/makefile.mk | 16 | ||||
| -rw-r--r-- | registry/workben/regtest.cxx | 8 | ||||
| -rw-r--r-- | registry/workben/test.cxx | 6 |
3 files changed, 22 insertions, 8 deletions
diff --git a/registry/workben/makefile.mk b/registry/workben/makefile.mk index 317b7e3110f9..43a09bdb8ce7 100644 --- a/registry/workben/makefile.mk +++ b/registry/workben/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.10.2 $ # # This file is part of OpenOffice.org. # @@ -36,6 +36,8 @@ TARGET=regtest TARGETTYPE=CUI LIBTARGET=NO +ENABLE_EXCEPTIONS := TRUE + # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk @@ -62,7 +64,19 @@ APP1STDLIBS=\ APP2TARGET= test APP2OBJS= $(OBJ)$/test.obj +APP2RPATH=NONE +.IF "$(GUI)"=="UNX" && "$(OS)"!="MACOSX" + +.IF "$(OS)"=="LINUX" +APP2LINKFLAGS=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../lib'\' +.ENDIF +.IF "$(OS)"=="SOLARIS" +APP2LINKFLAGS=-R\''$$ORIGIN/../lib:$$ORIGIN'\' +.ENDIF + +.ENDIF # "$(OS)"=="UNX" + APP2STDLIBS=\ $(RGTLIB) diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx index 23ba5e14e2a0..eb1fa9b64ef8 100644 --- a/registry/workben/regtest.cxx +++ b/registry/workben/regtest.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: regtest.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.10.2 $ * * This file is part of OpenOffice.org. * @@ -42,9 +42,9 @@ using namespace std; using namespace rtl; #if (defined UNX) || (defined OS2) -int main( int argc, char * argv[] ) +int main() #else -int _cdecl main( int argc, char * argv[] ) +int _cdecl main() #endif { RegHandle hReg; @@ -103,7 +103,7 @@ int _cdecl main( int argc, char * argv[] ) cout << "8. close " << nSubKeys << "subkeys of \"myfirstKey\"\n\n"; - char* Value="Mein erster Value"; + char* Value=(char*)"Mein erster Value"; if (reg_setValue(hRootKey, OUString::createFromAscii("mySecondKey").pData, RG_VALUETYPE_STRING, Value, 18)) cout << "\t9. setValue of key \"mySecondKey\" failed\n"; else diff --git a/registry/workben/test.cxx b/registry/workben/test.cxx index c2ecd485cc26..c9b7038bb09a 100644 --- a/registry/workben/test.cxx +++ b/registry/workben/test.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: test.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.10.1 $ * * This file is part of OpenOffice.org. * @@ -34,9 +34,9 @@ #include <stdio.h> #if (defined UNX) || (defined OS2) -int main( int argc, char * argv[] ) +int main() #else -int _cdecl main( int argc, char * argv[] ) +int _cdecl main() #endif { void test_coreReflection(); |