[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl

[Pedro Giffuni]

 sal/osl/unx/diagnose.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 28b9aab0830dc5015593203f71d5ccdaf59fa730
Author: Pedro Giffuni <pfg at apache.org>
Date:   Mon Jan 16 18:08:58 2017 +0000

    osl_diagnose_backtrace_Impl(): leave a default value for FreeBSD.
    
    Thinking of a future ARM support that may want to give some value to
    FRAME_PTR_OFFSET and FRAME_OFFSET.

diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c
index e944665..a78d467 100644
--- a/sal/osl/unx/diagnose.c
+++ b/sal/osl/unx/diagnose.c
@@ -205,9 +205,7 @@ static void osl_diagnose_backtrace_Impl (oslDebugMessageFunc f)
 #define FRAME_OFFSET     0
 #define STACK_BIAS       0x7ff
 
-#endif
-
-#if defined(X86) || defined(X86_64)
+#else /* defined(X86) || defined(X86_64) */
 
 #define FRAME_PTR_OFFSET 3
 #define FRAME_OFFSET 0