[Libreoffice-commits] core.git: bean/native

Mike Kaganski mike.kaganski at collabora.com
Wed Jan 31 20:02:35 UTC 2018


 bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 0b3ecd909ca337d920cca412d9813851ace55da1
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 10:08:45 2018 +0300

    bean: MSVC: pragma warning: make more specific, remove obsolete
    
    Change-Id: Id575db58199f438e95d9c73778cc520c452e1a42
    Reviewed-on: https://gerrit.libreoffice.org/48948
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index dd19fe7931b8..5d1bdb0f5cc8 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -17,19 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
 #if defined _MSC_VER
-#pragma warning(push, 1)
+#pragma warning(push)
+#pragma warning(disable : 4201) /* nonstandard extension used: nameless struct/union */
 #endif
 #include <jawt_md.h>
 #if defined _MSC_VER


More information about the Libreoffice-commits mailing list