diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-01 17:12:28 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-01 17:12:28 +0100 |
commit | 0d139d3d2ee2ccca6c2c162e169a227d76147612 (patch) | |
tree | 86bcb74f3d7626b63df0ba1f0b6877d1cf099093 /bridges/source/cpp_uno/gcc3_linux_hppa | |
parent | 61100f6fc62766a3ee25484f381ac5425687cf58 (diff) |
Oops, use #if instead of #ifdef
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_hppa')
-rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx | 2 | ||||
-rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx | 18 | ||||
-rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx index 071170190397..f434b7e0ba91 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/call.cxx @@ -106,7 +106,7 @@ void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, pMethod += 4 * nVtableIndex; pMethod = *((sal_uInt32 *)pMethod); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "this is %p\n", pGPR[0]); for (int i = 0; i < hppa::MAX_GPR_REGS ; ++i) fprintf(stderr, "normal reg %d is %d %x\n", i, pGPR[i], pGPR[i]); diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx index 9e31fbc6a8bb..e96217495ddb 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx @@ -65,7 +65,7 @@ namespace void ** startovrflw = ovrflw; int nregs = 0; //number of words passed in registers -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "cpp2uno_call\n"); #endif // return @@ -81,14 +81,14 @@ namespace { if (hppa::isRegisterReturn(pReturnTypeRef)) { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "simple return\n"); #endif pUnoReturn = pRegisterReturn; // direct way for simple types } else { -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "complex return via r8\n"); #endif pCppReturn = (void *)r8; @@ -295,14 +295,14 @@ namespace uno_Any aUnoExc; // Any will be constructed by callee uno_Any * pUnoExc = &aUnoExc; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "before dispatch\n"); #endif // invoke uno dispatch call (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "after dispatch\n"); #endif @@ -384,7 +384,7 @@ namespace { void ** ovrflw = (void**)(sp); -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "cpp_mediate with\n"); fprintf(stderr, "%x %x\n", nFunctionIndex, nVtableOffset); fprintf(stderr, "and %x %x\n", (long)(ovrflw[0]), (long)(ovrflw[-1])); @@ -407,14 +407,14 @@ namespace { nFunctionIndex &= 0x7fffffff; pThis = gpreg[1]; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pThis is gpreg[1]\n"); #endif } else { pThis = gpreg[0]; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "pThis is gpreg[0]\n"); #endif } @@ -578,7 +578,7 @@ sal_Int64 cpp_vtable_call( sal_uInt32 in0, sal_uInt32 in1, sal_uInt32 in2, sal_u register double d3 asm("fr7"); dpreg[3] = d3; -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "got to cpp_vtable_call with %x %x\n", functionIndex, vtableOffset); for (int i = 0; i < hppa::MAX_GPR_REGS; ++i) fprintf(stderr, "reg %d is %d %x\n", i, gpreg[i], gpreg[i]); diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx index d8c36c386667..6c3b25c387fa 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx @@ -248,7 +248,7 @@ static void cpp_call( { case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "hyper is %llx\n", *((long long*)pCppArgs[nPos])); #endif INSERT_INT64( pCppArgs[nPos], nRegs, pGPR, pStack, pStackStart, bOverFlow ); @@ -256,7 +256,7 @@ static void cpp_call( case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_ENUM: -#ifdef OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 fprintf(stderr, "long is %x\n", pCppArgs[nPos]); #endif INSERT_INT32( pCppArgs[nPos], nRegs, pGPR, pStack, bOverFlow ); |