[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc

[Libreoffice Gerrit user]

 binfilter/bf_sc/source/core/inc/interpre.hxx |   16 ----------------
 binfilter/inc/bf_sc/subtotal.hxx             |   14 +-------------
 2 files changed, 1 insertion(+), 29 deletions(-)

New commits:
commit cb7236fb473f91aaa6f414de1ba1e10bdfb93878
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 26 09:49:33 2012 +0200

    MSC can #include <setjmp.h> just fine
    
    ...the manual redefinition led to errors now, looks like some header always
    drags in setjmp.h now (maybe core 5ae27819974e3492b6f4d33fa51ef2a9d77b5ce5 "use
    intrinsict to inline InterlockCount() on Windows too")
    
    Change-Id: I613cd35b1475a3ba1061bd8faafd36ac99a0d94b

diff --git a/binfilter/bf_sc/source/core/inc/interpre.hxx b/binfilter/bf_sc/source/core/inc/interpre.hxx
index 8c70e1b..12cbed9 100644
--- a/binfilter/bf_sc/source/core/inc/interpre.hxx
+++ b/binfilter/bf_sc/source/core/inc/interpre.hxx
@@ -49,22 +49,6 @@ class ScFormulaCell;
                                         // Maximum ca. 85 wird bei Invertierung
                                         // von 128 x 128 benoetigt!
 
-
-#ifndef MSC
-    #include <setjmp.h>
-#else
-    extern "C"
-    {
-    #define _JBLEN  9  /* bp, di, si, sp, ret addr, ds */
-    typedef  int  jmp_buf[_JBLEN];
-    #define _JMP_BUF_DEFINED
-    #define setjmp  _setjmp
-    int  __cdecl _setjmp(jmp_buf);
-    void __cdecl longjmp(jmp_buf, int);
-    };
-#endif
-
-
 struct ScCompare
 {
     double  nVal[2];
diff --git a/binfilter/inc/bf_sc/subtotal.hxx b/binfilter/inc/bf_sc/subtotal.hxx
index 14b8a8c..c810fa1 100644
--- a/binfilter/inc/bf_sc/subtotal.hxx
+++ b/binfilter/inc/bf_sc/subtotal.hxx
@@ -24,19 +24,7 @@
 
 #include "global.hxx"
 
-#ifndef MSC
-    #include <setjmp.h>
-#else
-    extern "C"
-    {
-    #define _JBLEN  9  /* bp, di, si, sp, ret addr, ds */
-    typedef  int  jmp_buf[_JBLEN];
-    #define _JMP_BUF_DEFINED
-    #define setjmp  _setjmp
-    int  __cdecl _setjmp(jmp_buf);
-    void __cdecl longjmp(jmp_buf, int);
-    };
-#endif
+#include <setjmp.h>
 
 namespace binfilter {