[Libreoffice-commits] core.git: vcl/source

[Michael Stahl]

 vcl/source/filter/jpeg/jpegc.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit abc57d344806b8d0bca113900702c155354124ac
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 10 19:33:58 2015 +0100

    Revert "Werror: C4324 structure was padded due to __declspec(align())"
    
    This reverts commit 9150bb0b3ea3f32e867aad478ef82a74fe0726ce.
    
    It causes CppunitTest_vcl_filters_test to segfault in longjmp() on
    Linux.

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index c1a0887..2c9908b 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -39,8 +39,8 @@ extern "C" {
 
 struct ErrorManagerStruct
 {
-    jmp_buf setjmp_buffer;
     jpeg_error_mgr pub;
+    jmp_buf setjmp_buffer;
 };
 
 extern "C" void errorExit (j_common_ptr cinfo)