diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-25 06:02:05 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-25 06:02:05 +0000 |
| commit | 4b861993f8214901dfc0c1a4e075ba34fa2c605b (patch) | |
| tree | 070a358accad28a8fa8cbdd8c4033821ca6b3530 | |
| parent | e4b2386a785de60b880e3a87153ba1449c1057a4 (diff) | |
| download | ATCD-4b861993f8214901dfc0c1a4e075ba34fa2c605b.tar.gz | |
ChangeLogTag:Sun May 25 06:04:47 UTC 2003 Don Hinton <dhinton@dresystems.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ace/OS_Dirent.cpp | 2 | ||||
| -rw-r--r-- | ace/ace_wchar.h | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 728f4bae8a4..9f5ab8e679e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sun May 25 06:04:47 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * ace/OS_Dirent.cpp: + * ace/ace_wchar.h: + Added defines for ACE_TEXT_File_Attributes for both + ACE_USES_WCHAR and !ACE_USES_WCHAR and changed the call in + OS_Dirent.cpp to use the new macro. + Sat May 24 17:21:40 UTC 2003 Don Hinton <dhinton@dresystems.com> * examples/Service_Configurator/Misc/Makefile: diff --git a/ace/OS_Dirent.cpp b/ace/OS_Dirent.cpp index 2ca31dbd278..58f02e7cc80 100644 --- a/ace/OS_Dirent.cpp +++ b/ace/OS_Dirent.cpp @@ -34,7 +34,7 @@ ACE_OS_Dirent::opendir_emulation (const ACE_TCHAR *filename) ACE_TCHAR extra[3] = {0,0,0}; // Check if filename is a directory. - DWORD fileAttribute = ::GetFileAttributes (filename); + DWORD fileAttribute = ACE_TEXT_GetFileAttributes (filename); if (fileAttribute == INVALID_FILE_ATTRIBUTES || !(fileAttribute & FILE_ATTRIBUTE_DIRECTORY)) return 0; diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h index 08ccbd17859..a2eb7b91511 100644 --- a/ace/ace_wchar.h +++ b/ace/ace_wchar.h @@ -248,6 +248,7 @@ typedef ACE_Wide_To_Ascii ACE_OS_WString; #define ACE_TEXT_FreeEnvironmentStrings ::FreeEnvironmentStringsW #define ACE_TEXT_GetComputerName ::GetComputerNameW #define ACE_TEXT_GetEnvironmentStrings ::GetEnvironmentStringsW +#define ACE_TEXT_GetFileAttributes ::GetFileAttributesW #define ACE_TEXT_GetModuleFileName ::GetModuleFileNameW #define ACE_TEXT_GetTempPath ::GetTempPathW #define ACE_TEXT_GetUserName ::GetUserNameW @@ -295,6 +296,7 @@ typedef ACE_Wide_To_Ascii ACE_OS_WString; #define ACE_TEXT_FreeEnvironmentStrings ::FreeEnvironmentStringsA #define ACE_TEXT_GetComputerName ::GetComputerNameA #define ACE_TEXT_GetEnvironmentStrings ::GetEnvironmentStringsA +#define ACE_TEXT_GetFileAttributes ::GetFileAttributesA #define ACE_TEXT_GetModuleFileName ::GetModuleFileNameA #define ACE_TEXT_GetTempPath ::GetTempPathA #define ACE_TEXT_GetUserName ::GetUserNameA |