diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-07-31 17:17:57 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-07-31 17:17:57 +0000 |
| commit | 422d9012926a0cfed2fa55dbdacdc5d6c06b1805 (patch) | |
| tree | c19d81d63c1388c3c435a4115c67e2e58a87f585 | |
| parent | 8ae22af29ee8a7284761ec4e2043e791efbff150 (diff) | |
| download | ATCD-422d9012926a0cfed2fa55dbdacdc5d6c06b1805.tar.gz | |
ChangeLogTag: Tue Jul 31 17:15:47 UTC 2007 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_dirent.h | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 74c94b7cbcd..dd7c9f13287 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Tue Jul 31 17:15:47 UTC 2007 Olli Savia <ops@iki.fi> + + * ace/OS_NS_dirent.h: + Fixed compile error on platforms that define ACE_LACKS_REWINDDIR. + Tue Jul 31 15:02:34 UTC 2007 Steve Huston <shuston@riverace.com> * tests/Multicast_Test_IPV6.cpp: Added some more diagnostic output and diff --git a/ACE/ace/OS_NS_dirent.h b/ACE/ace/OS_NS_dirent.h index 2656495d894..f830e9db6b6 100644 --- a/ACE/ace/OS_NS_dirent.h +++ b/ACE/ace/OS_NS_dirent.h @@ -62,15 +62,17 @@ extern "C" { * */ +#if !defined (ACE_LACKS_REWINDDIR) inline void ace_rewinddir_helper (ACE_DIR *dir) { -#if defined (rewinddir) +# if defined (rewinddir) rewinddir (dir); -#undef rewinddir -#else +# undef rewinddir +# else ACE_STD_NAMESPACE::rewinddir (dir); -#endif /* defined (rewinddir) */ +# endif /* defined (rewinddir) */ } +#endif /* ACE_LACKS_REWINDDIR */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL |