diff options
Diffstat (limited to 'ace/OS_NS_dirent.h')
| -rw-r--r-- | ace/OS_NS_dirent.h | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/ace/OS_NS_dirent.h b/ace/OS_NS_dirent.h index 6def1696ac0..c5bf0efd859 100644 --- a/ace/OS_NS_dirent.h +++ b/ace/OS_NS_dirent.h @@ -33,8 +33,6 @@ #endif #define ACE_EXPORT_MACRO ACE_Export -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION @@ -44,22 +42,22 @@ namespace ACE_OS { ACE_DIR *opendir (const ACE_TCHAR *filename); ACE_NAMESPACE_INLINE_FUNCTION - struct ACE_DIRENT *readdir (ACE_DIR *); + dirent *readdir (ACE_DIR *); ACE_NAMESPACE_INLINE_FUNCTION int readdir_r (ACE_DIR *dirp, - struct ACE_DIRENT *entry, - struct ACE_DIRENT **result); + struct dirent *entry, + struct dirent **result); ACE_NAMESPACE_INLINE_FUNCTION void rewinddir (ACE_DIR *); ACE_NAMESPACE_INLINE_FUNCTION int scandir (const ACE_TCHAR *dirname, - struct ACE_DIRENT **namelist[], - int (*selector) (const struct ACE_DIRENT *filename), - int (*comparator) (const struct ACE_DIRENT **f1, - const struct ACE_DIRENT **f2)); + struct dirent **namelist[], + int (*selector) (const struct dirent *filename), + int (*comparator) (const struct dirent **f1, + const struct dirent **f2)); ACE_NAMESPACE_INLINE_FUNCTION void seekdir (ACE_DIR *, @@ -74,21 +72,19 @@ namespace ACE_OS { extern ACE_Export int scandir_emulation (const ACE_TCHAR *dirname, - ACE_DIRENT **namelist[], - int (*selector)(const ACE_DIRENT *entry), - int (*comparator)(const ACE_DIRENT **f1, - const ACE_DIRENT**f2)); + dirent **namelist[], + int (*selector)(const dirent *entry), + int (*comparator)(const dirent **f1, + const dirent**f2)); extern ACE_Export void closedir_emulation (ACE_DIR *); extern ACE_Export - struct ACE_DIRENT *readdir_emulation (ACE_DIR *); + dirent *readdir_emulation (ACE_DIR *); } /* namespace ACE_OS */ -ACE_END_VERSIONED_NAMESPACE_DECL - # if defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) # undef ACE_INLINE |