Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't duplicate INVALID_FILE_ATTRIBUTES definition.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2011-02-22 13:26:06 +00:00
parent 6d2139e829
commit 6235846c0c
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/missing.h
View File

@@ -537,5 +537,9 @@ typedef struct
#endif #endif
#endif // defined __WINE__ #endif // defined __WINE__
#ifndef INVALID_FILE_ATTRIBUTES
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
#endif
#endif #endif
// _WX_MISSING_H_ // _WX_MISSING_H_

4
src/common/filefn.cpp
View File

@@ -98,10 +98,6 @@
#define _MAXPATHLEN 1024 #define _MAXPATHLEN 1024
#endif #endif
#ifndef INVALID_FILE_ATTRIBUTES
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// private globals // private globals
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

7
src/common/filename.cpp
View File

@@ -153,13 +153,6 @@
extern const wxULongLong wxInvalidSize = (unsigned)-1; extern const wxULongLong wxInvalidSize = (unsigned)-1;
#endif // wxUSE_LONGLONG #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 namespace
{ {