[Libreoffice-commits] core.git: include/prewin.h

Mike Kaganski mike.kaganski at collabora.com
Thu Feb 1 16:57:31 UTC 2018


 include/prewin.h |   16 ----------------
 1 file changed, 16 deletions(-)

New commits:
commit 8e07fb35074e0f23e7676cdf4499582b7c3c1bbb
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 16:14:43 2018 +0300

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

diff --git a/include/prewin.h b/include/prewin.h
index f0371654c2c6..ebdf4aaf518f 100644
--- a/include/prewin.h
+++ b/include/prewin.h
@@ -34,32 +34,16 @@
 #if !defined STRICT
 #   define STRICT
 #endif
-#ifdef _MSC_VER
-#   pragma warning(push, 1)
-#   pragma warning (disable: 4005)
-#endif
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-#ifdef _MSC_VER
-#   pragma warning(pop)
-#endif
-
 #include <shellapi.h>
 #include <commdlg.h>
 #include <dlgs.h>
 
-#ifdef _MSC_VER
-#   pragma warning(push, 1)
-#endif
-
 #include <commctrl.h>
 
-#ifdef _MSC_VER
-#   pragma warning(pop)
-#endif
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list