fpicker/source/win32/filepicker/VistaFilePicker.cxx | 3 --- fpicker/source/win32/filepicker/platform_vista.h | 1 + 2 files changed, 1 insertion(+), 3 deletions(-)
New commits: commit 0abfcb735e60757ee64aa6d0fbb1b601c29813f3 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Dec 7 09:34:48 2015 +0100 Undef RGB where it was defined, not where it gets used Change-Id: I1e122bb7c32850dfdd74de029c8d92a328207a95 Reviewed-on: https://gerrit.libreoffice.org/20430 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 3cc0e5d..47f649c 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -43,9 +43,6 @@ #include <osl/mutex.hxx> #include <osl/file.hxx> #include <tchar.h> -#ifdef RGB -#undef RGB -#endif #include <officecfg/Office/Common.hxx> #ifdef _MSC_VER diff --git a/fpicker/source/win32/filepicker/platform_vista.h b/fpicker/source/win32/filepicker/platform_vista.h index 1d8dea8..359e5ae 100644 --- a/fpicker/source/win32/filepicker/platform_vista.h +++ b/fpicker/source/win32/filepicker/platform_vista.h @@ -36,6 +36,7 @@ #if defined _MSC_VER #pragma warning(push, 1) #include <comip.h> +#undef RGB #pragma warning(pop) #endif _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits