odk/source/unoapploader/win/unoapploader.c | 6 ------
odk/source/unowinreg/win/unowinreg.cxx | 6 ------
2 files changed, 12 deletions(-)
New commits:
commit 682cef7d375f38656ec6b4b91213524d40586f44
Author: Mike Kaganski <mike.kagan...@collabora.com>
Date: Wed Jan 31 20:41:53 2018 +0300
odk: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Ie5957edb3954507505a7df9fad9f8da6b87b09d0
Reviewed-on: https://gerrit.libreoffice.org/49038
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/odk/source/unoapploader/win/unoapploader.c
b/odk/source/unoapploader/win/unoapploader.c
index d07366065075..d7a20e8f13ec 100644
--- a/odk/source/unoapploader/win/unoapploader.c
+++ b/odk/source/unoapploader/win/unoapploader.c
@@ -22,16 +22,10 @@
#include <string.h>
#include <process.h>
-#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
#include <cppuhelper/findsofficepath.h>
#include <sal/types.h>
diff --git a/odk/source/unowinreg/win/unowinreg.cxx
b/odk/source/unowinreg/win/unowinreg.cxx
index 64c612e362da..98934bd2d052 100644
--- a/odk/source/unowinreg/win/unowinreg.cxx
+++ b/odk/source/unowinreg/win/unowinreg.cxx
@@ -18,16 +18,10 @@
*/
-#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
#include <jni.h>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
