Kaydet (Commit) 0abfcb73 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Undef RGB where it was defined, not where it gets used

Change-Id: I1e122bb7c32850dfdd74de029c8d92a328207a95
Reviewed-on: https://gerrit.libreoffice.org/20430Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 764ec213
...@@ -43,9 +43,6 @@ ...@@ -43,9 +43,6 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <osl/file.hxx> #include <osl/file.hxx>
#include <tchar.h> #include <tchar.h>
#ifdef RGB
#undef RGB
#endif
#include <officecfg/Office/Common.hxx> #include <officecfg/Office/Common.hxx>
#ifdef _MSC_VER #ifdef _MSC_VER
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#if defined _MSC_VER #if defined _MSC_VER
#pragma warning(push, 1) #pragma warning(push, 1)
#include <comip.h> #include <comip.h>
#undef RGB
#pragma warning(pop) #pragma warning(pop)
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment