summaryrefslogtreecommitdiff
path: root/extensions/test/ole
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-11-27 14:41:16 +0200
committerTor Lillqvist <tlillqvist@suse.com>2012-11-28 20:53:40 +0200
commita3ce60eb3c8bb5c69ab41556398efa8316286477 (patch)
treea9600fdf96ab53a1aef150fd9c4a1e8c23b9eb90 /extensions/test/ole
parentabfe16cec61eae33c64cb1901f0fc740b0466f60 (diff)
We only support MSVC 2008 (_MSC_VER 1500) or later
We can drop or simplify many conditionals. Change-Id: I37e820e515cc09845c30b62c89ddb3b6ff370f97
Diffstat (limited to 'extensions/test/ole')
-rw-r--r--extensions/test/ole/AxTestComponents/StdAfx.h4
-rw-r--r--extensions/test/ole/EventListenerSample/EventListener/StdAfx.h4
-rw-r--r--extensions/test/ole/MfcControl/MfcControl.h4
-rw-r--r--extensions/test/ole/MfcControl/MfcControlCtl.h4
-rw-r--r--extensions/test/ole/MfcControl/MfcControlPpg.h4
-rw-r--r--extensions/test/ole/MfcControl/StdAfx.h4
-rw-r--r--extensions/test/ole/cpptest/cpptest.cxx4
-rw-r--r--extensions/test/ole/unoTocomCalls/Test/StdAfx.h4
-rw-r--r--extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h4
9 files changed, 18 insertions, 18 deletions
diff --git a/extensions/test/ole/AxTestComponents/StdAfx.h b/extensions/test/ole/AxTestComponents/StdAfx.h
index 3400227d6a5a..f25e075be701 100644
--- a/extensions/test/ole/AxTestComponents/StdAfx.h
+++ b/extensions/test/ole/AxTestComponents/StdAfx.h
@@ -23,9 +23,9 @@
#if !defined(AFX_STDAFX_H__BFE10EB4_8584_11D4_8335_005004526AB4__INCLUDED_)
#define AFX_STDAFX_H__BFE10EB4_8584_11D4_8335_005004526AB4__INCLUDED_
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
#pragma once
-#endif // _MSC_VER > 1000
+#endif
#define STRICT
#ifndef _WIN32_WINNT
diff --git a/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h b/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h
index 4eda34b62c78..b27537feab08 100644
--- a/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h
+++ b/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h
@@ -23,9 +23,9 @@
#if !defined(AFX_STDAFX_H__E275407A_804A_477E_9A28_F5CA84E711C3__INCLUDED_)
#define AFX_STDAFX_H__E275407A_804A_477E_9A28_F5CA84E711C3__INCLUDED_
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
#pragma once
-#endif // _MSC_VER > 1000
+#endif
#define STRICT
#ifndef _WIN32_WINNT
diff --git a/extensions/test/ole/MfcControl/MfcControl.h b/extensions/test/ole/MfcControl/MfcControl.h
index 538e65696b82..ef7a4b4132a3 100644
--- a/extensions/test/ole/MfcControl/MfcControl.h
+++ b/extensions/test/ole/MfcControl/MfcControl.h
@@ -19,9 +19,9 @@
#if !defined(AFX_MFCCONTROL_H__AC221FBC_A0D8_11D4_833B_005004526AB4__INCLUDED_)
#define AFX_MFCCONTROL_H__AC221FBC_A0D8_11D4_833B_005004526AB4__INCLUDED_
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
#pragma once
-#endif // _MSC_VER > 1000
+#endif
// MfcControl.h : main header file for MFCCONTROL.DLL
diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.h b/extensions/test/ole/MfcControl/MfcControlCtl.h
index 7c02865eea64..fb95d210f8e3 100644
--- a/extensions/test/ole/MfcControl/MfcControlCtl.h
+++ b/extensions/test/ole/MfcControl/MfcControlCtl.h
@@ -19,9 +19,9 @@
#if !defined(AFX_MFCCONTROLCTL_H__AC221FC3_A0D8_11D4_833B_005004526AB4__INCLUDED_)
#define AFX_MFCCONTROLCTL_H__AC221FC3_A0D8_11D4_833B_005004526AB4__INCLUDED_
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
#pragma once
-#endif // _MSC_VER > 1000
+#endif
// MfcControlCtl.h : Declaration of the CMfcControlCtrl ActiveX Control class.
diff --git a/extensions/test/ole/MfcControl/MfcControlPpg.h b/extensions/test/ole/MfcControl/MfcControlPpg.h
index aadd3fb38624..821152a1ff38 100644
--- a/extensions/test/ole/MfcControl/MfcControlPpg.h
+++ b/extensions/test/ole/MfcControl/MfcControlPpg.h
@@ -19,9 +19,9 @@
#if !defined(AFX_MFCCONTROLPPG_H__AC221FC5_A0D8_11D4_833B_005004526AB4__INCLUDED_)
#define AFX_MFCCONTROLPPG_H__AC221FC5_A0D8_11D4_833B_005004526AB4__INCLUDED_
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
#pragma once
-#endif // _MSC_VER > 1000
+#endif
// MfcControlPpg.h : Declaration of the CMfcControlPropPage property page class.
diff --git a/extensions/test/ole/MfcControl/StdAfx.h b/extensions/test/ole/MfcControl/StdAfx.h
index 882e5d23e416..b3a303a6c19b 100644
--- a/extensions/test/ole/MfcControl/StdAfx.h
+++ b/extensions/test/ole/MfcControl/StdAfx.h
@@ -19,9 +19,9 @@
#if !defined(AFX_STDAFX_H__AC221FBA_A0D8_11D4_833B_005004526AB4__INCLUDED_)
#define AFX_STDAFX_H__AC221FBA_A0D8_11D4_833B_005004526AB4__INCLUDED_
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
#pragma once
-#endif // _MSC_VER > 1000
+#endif
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently,
diff --git a/extensions/test/ole/cpptest/cpptest.cxx b/extensions/test/ole/cpptest/cpptest.cxx
index b711c401e3a2..6c6556cda8e9 100644
--- a/extensions/test/ole/cpptest/cpptest.cxx
+++ b/extensions/test/ole/cpptest/cpptest.cxx
@@ -20,9 +20,9 @@
// cpptest.cpp : Defines the entry point for the console application.
//
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
#pragma once
-#endif // _MSC_VER > 1000
+#endif
#pragma warning(disable: 4917)
#include <comdef.h>
#include <tchar.h>
diff --git a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h b/extensions/test/ole/unoTocomCalls/Test/StdAfx.h
index 6cd33d8191b2..4a9eda2a51ad 100644
--- a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h
+++ b/extensions/test/ole/unoTocomCalls/Test/StdAfx.h
@@ -24,9 +24,9 @@
#if !defined(AFX_STDAFX_H__180FF568_6F5C_11D4_8330_005004526AB4__INCLUDED_)
#define AFX_STDAFX_H__180FF568_6F5C_11D4_8330_005004526AB4__INCLUDED_
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
#pragma once
-#endif // _MSC_VER > 1000
+#endif
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h
index f837a8c37732..b35c1ddc8df9 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h
@@ -23,9 +23,9 @@
#if !defined(AFX_STDAFX_H__180FF556_6F5C_11D4_8330_005004526AB4__INCLUDED_)
#define AFX_STDAFX_H__180FF556_6F5C_11D4_8330_005004526AB4__INCLUDED_
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
#pragma once
-#endif // _MSC_VER > 1000
+#endif
#define STRICT
#ifndef _WIN32_WINNT