summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-04-12 00:30:03 +0200
committerMichael Stahl <mstahl@redhat.com>2013-04-15 15:26:31 +0200
commit099e517ead8501260e914e1374e85bc8491a81ac (patch)
tree88100213deaa88554be49b8245e15b627c14022f /extensions
parent3213cd54b76bc80a6f0516aac75a48ff3b2ad67c (diff)
extensions: remove various #undef _DEBUG
These came in on issue 10000 a decade ago. Change-Id: Iae1995daa413e644ad869a6f02521634af8425b6
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/activex/SOActionsApproval.h4
-rw-r--r--extensions/source/activex/SOActiveX.h3
-rw-r--r--extensions/source/activex/SOComWindowPeer.h3
-rw-r--r--extensions/source/activex/SODispatchInterceptor.h3
-rw-r--r--extensions/source/activex/StdAfx2.cxx4
-rw-r--r--extensions/source/ole/oledll.cxx3
-rw-r--r--extensions/source/ole/wincrap.hxx4
7 files changed, 0 insertions, 24 deletions
diff --git a/extensions/source/activex/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h
index de2cf52f24cc..d40c14243d14 100644
--- a/extensions/source/activex/SOActionsApproval.h
+++ b/extensions/source/activex/SOActionsApproval.h
@@ -31,10 +31,6 @@
#include <ExDisp.h>
#include <shlguid.h>
-#ifdef _MSC_VER
-#undef _DEBUG
-#endif
-
#include <atlctl.h>
#include "so_activex.h"
diff --git a/extensions/source/activex/SOActiveX.h b/extensions/source/activex/SOActiveX.h
index 4bef47a98765..908abf8106c8 100644
--- a/extensions/source/activex/SOActiveX.h
+++ b/extensions/source/activex/SOActiveX.h
@@ -34,9 +34,6 @@
#include <ExDisp.h>
#include <shlguid.h>
-#ifdef _MSC_VER
-#undef _DEBUG
-#endif
#include <atlctl.h>
#include "so_activex.h"
diff --git a/extensions/source/activex/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h
index 0e8dc37a9684..9816ad33bde9 100644
--- a/extensions/source/activex/SOComWindowPeer.h
+++ b/extensions/source/activex/SOComWindowPeer.h
@@ -31,9 +31,6 @@
#include <ExDisp.h>
#include <shlguid.h>
-#ifdef _MSC_VER
-#undef _DEBUG
-#endif
#include <atlctl.h>
#include "so_activex.h"
diff --git a/extensions/source/activex/SODispatchInterceptor.h b/extensions/source/activex/SODispatchInterceptor.h
index d873c6b41eac..ab6706611154 100644
--- a/extensions/source/activex/SODispatchInterceptor.h
+++ b/extensions/source/activex/SODispatchInterceptor.h
@@ -31,9 +31,6 @@
#include <ExDisp.h>
#include <shlguid.h>
-#ifdef _MSC_VER
-#undef _DEBUG
-#endif
#include <atlctl.h>
#include "so_activex.h"
diff --git a/extensions/source/activex/StdAfx2.cxx b/extensions/source/activex/StdAfx2.cxx
index 82a8f5454715..9418fbbb2d92 100644
--- a/extensions/source/activex/StdAfx2.cxx
+++ b/extensions/source/activex/StdAfx2.cxx
@@ -30,8 +30,4 @@
#include <statreg.h>
#endif
-#ifdef _MSC_VER
-#undef _DEBUG
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx
index a4b75951ddf0..626937704021 100644
--- a/extensions/source/ole/oledll.cxx
+++ b/extensions/source/ole/oledll.cxx
@@ -25,9 +25,6 @@
#pragma warning (push,1)
#pragma warning (disable:4548)
-#if defined(_MSC_VER) && !defined(_DEBUG_RUNTIME)
-#undef _DEBUG
-#endif
#ifdef __MINGW32__
#define _INIT_ATL_COMMON_VARS
#endif
diff --git a/extensions/source/ole/wincrap.hxx b/extensions/source/ole/wincrap.hxx
index c77e52ee06b0..e7c308461a5a 100644
--- a/extensions/source/ole/wincrap.hxx
+++ b/extensions/source/ole/wincrap.hxx
@@ -26,10 +26,6 @@
// http://stackoverflow.com/questions/5839292/error-c1189-after-installing-visual-studio-2010
#define _WIN32_WINNT 0x0403
-#ifdef _MSC_VER
-#undef _DEBUG // why?
-#endif
-
#define STRICT
#define _WIN32_DCOM