feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Fixed to work with _UNICODE on Win32

Browse Source 
[SVN r11071]
This commit is contained in:
John Maddock
2001-09-08 12:03:55 +00:00
parent b2396011f9
commit 7bd8e2a14d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/fileiter.cpp
View File

@ -63,9 +63,9 @@ void mapfile::open(const char* file)
#if defined(__CYGWIN__)||defined(__CYGWIN32__) #if defined(__CYGWIN__)||defined(__CYGWIN32__)
char win32file[ MAX_PATH ]; char win32file[ MAX_PATH ];
cygwin_conv_to_win32_path( file, win32file ); cygwin_conv_to_win32_path( file, win32file );
hfile = CreateFile(win32file, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); hfile = CreateFileA(win32file, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
#else #else
hfile = CreateFile(file, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); hfile = CreateFileA(file, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
#endif #endif
if(hfile != INVALID_HANDLE_VALUE) if(hfile != INVALID_HANDLE_VALUE)
{ {
@ -393,7 +393,7 @@ file_iterator::file_iterator(const char* wild)
#endif #endif
ref = new file_iterator_ref(); ref = new file_iterator_ref();
ref->hf = FindFirstFile(wild, &(ref->_data)); ref->hf = FindFirstFileA(wild, &(ref->_data));
ref->count = 1; ref->count = 1;
if(ref->hf == _fi_invalid_handle) if(ref->hf == _fi_invalid_handle)
@ -487,7 +487,7 @@ void file_iterator::next()
bool cont = true; bool cont = true;
while(cont) while(cont)
{ {
cont = FindNextFile(ref->hf, &(ref->_data)); cont = FindNextFileA(ref->hf, &(ref->_data));
if(cont && ((ref->_data.dwFileAttributes & _fi_dir) == 0)) if(cont && ((ref->_data.dwFileAttributes & _fi_dir) == 0))
break; break;
} }
@ -568,7 +568,7 @@ directory_iterator::directory_iterator(const char* wild)
#endif #endif
ref = new file_iterator_ref(); ref = new file_iterator_ref();
ref->count = 1; ref->count = 1;
ref->hf = FindFirstFile(wild, &(ref->_data)); ref->hf = FindFirstFileA(wild, &(ref->_data));
if(ref->hf == _fi_invalid_handle) if(ref->hf == _fi_invalid_handle)
{ {
*_path = 0; *_path = 0;
@ -658,7 +658,7 @@ void directory_iterator::next()
bool cont = true; bool cont = true;
while(cont) while(cont)
{ {
cont = FindNextFile(ref->hf, &(ref->_data)); cont = FindNextFileA(ref->hf, &(ref->_data));
if(cont && (ref->_data.dwFileAttributes & _fi_dir)) if(cont && (ref->_data.dwFileAttributes & _fi_dir))
{ {
if(std::strcmp(ref->_data.cFileName, ".") && std::strcmp(ref->_data.cFileName, "..")) if(std::strcmp(ref->_data.cFileName, ".") && std::strcmp(ref->_data.cFileName, ".."))