diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-01-18 10:14:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-18 10:14:13 +0100 |
| commit | dfc5c60f27c6ea1f566b1819ebbc3d979c19ffad (patch) | |
| tree | 8ed59abfe6eaabafec257cda3b99bd617ec5d18c /ACE/ace/OS_NS_sys_stat.inl | |
| parent | 956dcabf4bdd4fb3ec1be53c392398b495af27cf (diff) | |
| parent | d97b6edbeeb9a007f65e10e069a753bc087e998f (diff) | |
| download | ATCD-dfc5c60f27c6ea1f566b1819ebbc3d979c19ffad.tar.gz | |
Merge pull request #2035 from jwillemsen/jwi-cleanupsolaris
Cleanup Solaris support
Diffstat (limited to 'ACE/ace/OS_NS_sys_stat.inl')
| -rw-r--r-- | ACE/ace/OS_NS_sys_stat.inl | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl index 3e266681896..b3a7d38e142 100644 --- a/ACE/ace/OS_NS_sys_stat.inl +++ b/ACE/ace/OS_NS_sys_stat.inl @@ -28,12 +28,7 @@ namespace ACE_OS fstat (ACE_HANDLE handle, ACE_stat *stp) { ACE_OS_TRACE ("ACE_OS::fstat"); -#if defined (ACE_HAS_X86_STAT_MACROS) - // Solaris for intel uses an macro for fstat(), this is a wrapper - // for _fxstat() use of the macro. - // causes compile and runtime problems. - return ::_fxstat (_STAT_VER, handle, stp); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) BY_HANDLE_FILE_INFORMATION fdata; if (::GetFileInformationByHandle (handle, &fdata) == FALSE) @@ -65,7 +60,7 @@ namespace ACE_OS return MQX_Filesystem::inst ().fstat (handle, stp); #else return ::fstat (handle, stp); -#endif /* !ACE_HAS_X86_STAT_MACROS */ +#endif /* !ACE_WIN32 */ } // This function returns the number of bytes in the file referenced by @@ -123,11 +118,7 @@ namespace ACE_OS ACE_OS_TRACE ("ACE_OS::lstat"); # if defined (ACE_LACKS_LSTAT) return ACE_OS::stat (file, stp); -# elif defined (ACE_HAS_X86_STAT_MACROS) - // Solaris for intel uses an macro for lstat(), this macro is a - // wrapper for _lxstat(). - return ::_lxstat (_STAT_VER, file, stp); -# else /* !ACE_HAS_X86_STAT_MACROS */ +# else /* !ACE_LACKS_LSTAT */ return ::lstat (file, stp); # endif /* ACE_LACKS_LSTAT */ } @@ -194,10 +185,6 @@ namespace ACE_OS ACE_OS_TRACE ("ACE_OS::stat"); #if defined (ACE_LACKS_STAT) ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_HAS_X86_STAT_MACROS) - // Solaris for intel uses an macro for stat(), this macro is a - // wrapper for _xstat(). - return ::_xstat (_STAT_VER, file, stp); #elif defined (ACE_MQX) return MQX_Filesystem::inst ().stat (file, stp); #else |