diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-11-12 23:07:58 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-11-12 23:07:58 +0000 |
| commit | d3a1ea9f4b2e458737bd4c9f277ddf0580f3a28b (patch) | |
| tree | 73bc4301d1d5514895c301e0eec412913296b1b4 | |
| parent | b3c7b79eecced645ec6ff6f858564fc992d9c3fa (diff) | |
| download | ATCD-d3a1ea9f4b2e458737bd4c9f277ddf0580f3a28b.tar.gz | |
(hostname): added Chorus support.
| -rw-r--r-- | ace/OS.h | 1 | ||||
| -rw-r--r-- | ace/OS.i | 18 |
2 files changed, 10 insertions, 9 deletions
@@ -2331,6 +2331,7 @@ extern_C int getgid __((void)); extern_C int getuid __((void)); extern_C char* getcwd __((char* buf, size_t size)); extern_C int pipe __((int* fildes)); +extern_C int gethostname __((char*, size_t)); // This must come after limits.h is included #define MAXPATHLEN _POSIX_PATH_MAX @@ -1674,13 +1674,13 @@ ACE_OS::thread_mutex_trylock (ACE_thread_mutex_t *m) #elif defined (ACE_HAS_WTHREADS) #if defined (ACE_HAS_WIN32_TRYLOCK) BOOL result = ::TryEnterCriticalSection (m); - if (result == TRUE) + if (result == TRUE) return 0; else { errno = EBUSY; return -1; - } + } #else ACE_UNUSED_ARG (m); ACE_NOTSUP_RETURN (-1); @@ -5497,7 +5497,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen) #if defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetComputerNameA (name, LPDWORD (&maxnamelen)), ace_result_), int, -1); -#elif defined (VXWORKS) +#elif defined (VXWORKS) || defined (CHORUS) ACE_OSCALL_RETURN (::gethostname (name, maxnamelen), int, -1); #else /* !ACE_WIN32 */ struct utsname host_info; @@ -6583,9 +6583,9 @@ ACE_OS::flock_trywrlock (ACE_OS::ace_flock_t *lock, short whence, off_t start, o lock->overlapped_.Offset = start; if (len == 0) len = ::GetFileSize (lock->handle_, NULL); - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::LockFileEx (lock->handle_, - LOCKFILE_FAIL_IMMEDIATELY | LOCKFILE_EXCLUSIVE_LOCK, - 0, len, 0, + ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::LockFileEx (lock->handle_, + LOCKFILE_FAIL_IMMEDIATELY | LOCKFILE_EXCLUSIVE_LOCK, + 0, len, 0, &lock->overlapped_), ace_result_), int, -1); #elif defined (ACE_LACKS_FILELOCKS) @@ -6620,9 +6620,9 @@ ACE_OS::flock_tryrdlock (ACE_OS::ace_flock_t *lock, short whence, off_t start, o lock->overlapped_.Offset = start; if (len == 0) len = ::GetFileSize (lock->handle_, NULL); - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::LockFileEx (lock->handle_, - LOCKFILE_FAIL_IMMEDIATELY, - 0, len, 0, + ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::LockFileEx (lock->handle_, + LOCKFILE_FAIL_IMMEDIATELY, + 0, len, 0, &lock->overlapped_), ace_result_), int, -1); #elif defined (ACE_LACKS_FILELOCKS) |