summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-11-21 16:01:53 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-11-21 16:01:53 (GMT)
commitd7b68b575526b5f5e9d0a4e1b1b196bf70616154 (patch)
treed0d7ea6dda60ee6cbe8e81240da06055d76ec12a /win
parent02b543ede36c5f387093c576a915c0788628bedb (diff)
downloadtk-d7b68b575526b5f5e9d0a4e1b1b196bf70616154.zip
tk-d7b68b575526b5f5e9d0a4e1b1b196bf70616154.tar.gz
tk-d7b68b575526b5f5e9d0a4e1b1b196bf70616154.tar.bz2
Fix [1c0d6e162c8876fd1bc0526c7cc59c320853d23|1c0d6e162c]: tkWinDialog.c defines type "SIGDN" (enum __MIDL_IShellItem_0001), which is already defined
Diffstat (limited to 'win')
-rw-r--r--win/tkWinDialog.c33
1 files changed, 19 insertions, 14 deletions
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 37e4dfb..adb5e9e 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -209,19 +209,9 @@ enum OFNOper {
* older compilers? Should we prefix definitions with Tcl_ instead
* of using the same names as in the SDK?
*/
-#ifndef __IShellItemArray_INTERFACE_DEFINED__
-#define __IShellItemArray_INTERFACE_DEFINED__
-
-typedef enum SIATTRIBFLAGS {
- SIATTRIBFLAGS_AND = 0x1,
- SIATTRIBFLAGS_OR = 0x2,
- SIATTRIBFLAGS_APPCOMPAT = 0x3,
- SIATTRIBFLAGS_MASK = 0x3,
- SIATTRIBFLAGS_ALLITEMS = 0x4000
-} SIATTRIBFLAGS;
+#ifndef __IShellItem_INTERFACE_DEFINED__
+# define __IShellItem_INTERFACE_DEFINED__
#ifdef __MSVCRT__
-typedef ULONG SFGAOF;
-
typedef struct IShellItem IShellItem;
typedef enum __MIDL_IShellItem_0001 {
@@ -250,6 +240,21 @@ typedef struct IShellItemVtbl
struct IShellItem {
CONST_VTBL struct IShellItemVtbl *lpVtbl;
};
+#endif
+#endif
+
+#ifndef __IShellItemArray_INTERFACE_DEFINED__
+#define __IShellItemArray_INTERFACE_DEFINED__
+
+typedef enum SIATTRIBFLAGS {
+ SIATTRIBFLAGS_AND = 0x1,
+ SIATTRIBFLAGS_OR = 0x2,
+ SIATTRIBFLAGS_APPCOMPAT = 0x3,
+ SIATTRIBFLAGS_MASK = 0x3,
+ SIATTRIBFLAGS_ALLITEMS = 0x4000
+} SIATTRIBFLAGS;
+#ifdef __MSVCRT__
+typedef ULONG SFGAOF;
#endif /* __MSVCRT__ */
typedef struct IShellItemArray IShellItemArray;
typedef struct IShellItemArrayVtbl
@@ -1744,11 +1749,11 @@ static int GetFileNameXP(Tcl_Interp *interp, OFNOpts *optsPtr, enum OFNOper oper
* BUGFIX for d43a10ce2fed950e00890049f3c273f2cdd12583
* The original code was broken because it passed typeinfo[0]
* directly into Tcl_ObjSetVar2. In the case of typeInfo[0]
- * pointing into a list which is also referenced by
+ * pointing into a list which is also referenced by
* typeVariableObj, TOSV2 shimmers the object into
* variable intrep which loses the list representation.
* This invalidates typeInfo[0] which is freed but
- * nevertheless stored as the value of the variable.
+ * nevertheless stored as the value of the variable.
*/
Tcl_Obj *selFilterObj = typeInfo[0];
Tcl_IncrRefCount(selFilterObj);