svnno****@sourc*****
svnno****@sourc*****
2016年 11月 1日 (火) 15:01:12 JST
Tera TermRevision: 6519
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6519
Author: doda
Date: 2016-11-01 15:01:12 +0900 (Tue, 01 Nov 2016)
Log Message:
-----------
VC のバージョンではなく、専用の条件で判断するように変更
自前での宣言が必要か判別可能なので、その方法を使うべきだと思う
Modified Paths:
--------------
trunk/teraterm/teraterm/winjump.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/winjump.c
===================================================================
--- trunk/teraterm/teraterm/winjump.c 2016-10-30 15:51:40 UTC (rev 6518)
+++ trunk/teraterm/teraterm/winjump.c 2016-11-01 06:01:12 UTC (rev 6519)
@@ -52,7 +52,9 @@
#define PropVariantInit(pvar) memset((pvar),0,sizeof(PROPVARIANT))
#endif
-#if !(_MSC_VER >= 1600) // VC2010(VC10.0) or later
+#ifndef __ICustomDestinationList_INTERFACE_DEFINED__
+#define __ICustomDestinationList_INTERFACE_DEFINED__
+// #if !(_MSC_VER >= 1600) // VC2010(VC10.0) or later
typedef struct ICustomDestinationListVtbl {
HRESULT ( __stdcall *QueryInterface ) (
/* [in] ICustomDestinationList*/ void *This,
@@ -109,7 +111,10 @@
{
ICustomDestinationListVtbl *lpVtbl;
} ICustomDestinationList;
+#endif
+#ifndef __IObjectArray_INTERFACE_DEFINED__
+#define __IObjectArray_INTERFACE_DEFINED__
typedef struct IObjectArrayVtbl
{
HRESULT ( __stdcall *QueryInterface )(
@@ -139,7 +144,10 @@
{
IObjectArrayVtbl *lpVtbl;
} IObjectArray;
+#endif
+#ifndef __IShellLink_INTERFACE_DEFINED__
+#define __IShellLink_INTERFACE_DEFINED__
typedef struct IShellLinkVtbl
{
HRESULT ( __stdcall *QueryInterface )(
@@ -237,7 +245,10 @@
/* [string][in] */ LPCSTR pszFile);
} IShellLinkVtbl;
+#endif
+#ifndef __IObjectCollection_INTERFACE_DEFINED__
+#define __IObjectCollection_INTERFACE_DEFINED__
typedef struct IObjectCollectionVtbl
{
HRESULT ( __stdcall *QueryInterface )(
@@ -284,7 +295,9 @@
} IObjectCollection;
#endif
-#if !(_MSC_VER >= 1500) // VC2008(VC9.0) or later
+#ifndef __IPropertyStore_INTERFACE_DEFINED__
+#define __IPropertyStore_INTERFACE_DEFINED__
+// #if !(_MSC_VER >= 1500) // VC2008(VC9.0) or later
typedef struct IPropertyStoreVtbl
{
HRESULT ( __stdcall *QueryInterface )(