From 6235846c0c15bdbabe2809eef87e4e12d6137bd2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 22 Feb 2011 13:26:06 +0000
Subject: [PATCH] Don't duplicate INVALID_FILE_ATTRIBUTES definition.

Move it in wx/msw/missing.h header instead of defining it in two different
places.

Closes #12964.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/missing.h | 4 ++++
 src/common/filefn.cpp    | 4 ----
 src/common/filename.cpp  | 7 -------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index f4961c2562..95157acc1b 100644
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -537,5 +537,9 @@ typedef struct
     #endif
 #endif  // defined __WINE__
 
+#ifndef INVALID_FILE_ATTRIBUTES
+    #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
+#endif
+
 #endif
     // _WX_MISSING_H_
diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index f887f465d9..3fe29bbe8b 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -98,10 +98,6 @@
     #define _MAXPATHLEN 1024
 #endif
 
-#ifndef INVALID_FILE_ATTRIBUTES
-    #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
-#endif
-
 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------
diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index dd770afb71..b70eb4fd8d 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -153,13 +153,6 @@
 extern const wxULongLong wxInvalidSize = (unsigned)-1;
 #endif // wxUSE_LONGLONG
 
-#ifdef __WIN32__
-    // this define is missing from VC6 headers
-    #ifndef INVALID_FILE_ATTRIBUTES
-        #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
-    #endif
-#endif // __WIN32__
-
 namespace
 {
 
-- 
2.45.2