diff options
| author | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-22 15:31:53 +0000 |
|---|---|---|
| committer | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-22 15:31:53 +0000 |
| commit | 56e51d38d6d113be6a0a27d3a2da0fd08a7cd345 (patch) | |
| tree | 42d8c8883fbd527c65dae828823ff019ff2a0c19 | |
| parent | 8a6a18f7b8ae695a68ec96a1cdeb0f7906dfa894 (diff) | |
| download | ATCD-56e51d38d6d113be6a0a27d3a2da0fd08a7cd345.tar.gz | |
Correction for Chorus 4.0 support on the Ultra-SPARC.
Chad Elliott
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | ace/ACE.cpp | 2 | ||||
| -rw-r--r-- | ace/config-chorus.h | 6 |
5 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 8431722b6cb..391b54ead12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 22 09:29:09 2000 Chad Elliott <elliott_c@ociweb.com> + + * ace/config-chorus.h, ace/ACE.cpp + Correction for Chorus 4.0 support on the Ultra-SPARC. + Wed Mar 22 09:24:12 2000 Balachandran Natarajan <bala@cs.wustl.edu> * ace/Configuration.cpp: Fixed a link error with SunCC5. This diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 8431722b6cb..391b54ead12 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Wed Mar 22 09:29:09 2000 Chad Elliott <elliott_c@ociweb.com> + + * ace/config-chorus.h, ace/ACE.cpp + Correction for Chorus 4.0 support on the Ultra-SPARC. + Wed Mar 22 09:24:12 2000 Balachandran Natarajan <bala@cs.wustl.edu> * ace/Configuration.cpp: Fixed a link error with SunCC5. This diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 8431722b6cb..391b54ead12 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Wed Mar 22 09:29:09 2000 Chad Elliott <elliott_c@ociweb.com> + + * ace/config-chorus.h, ace/ACE.cpp + Correction for Chorus 4.0 support on the Ultra-SPARC. + Wed Mar 22 09:24:12 2000 Balachandran Natarajan <bala@cs.wustl.edu> * ace/Configuration.cpp: Fixed a link error with SunCC5. This diff --git a/ace/ACE.cpp b/ace/ACE.cpp index e37cd823ad0..1e552c66da3 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -3689,7 +3689,7 @@ ACE::get_handle (void) { // Solaris 2.x ACE_HANDLE handle = ACE_INVALID_HANDLE; -#if defined (sparc) +#if defined (sparc) && ! defined (CHORUS) handle = ACE_OS::open ("/dev/udp", O_RDONLY); #elif defined (__unix) || defined (__Lynx__) || defined (_AIX) // Note: DEC CXX doesn't define "unix" BSD compatible OS: HP UX, diff --git a/ace/config-chorus.h b/ace/config-chorus.h index 75d3c6fa5c5..2f6e4978ed2 100644 --- a/ace/config-chorus.h +++ b/ace/config-chorus.h @@ -44,6 +44,12 @@ // Used in OS.i to map an actor id into a KnCap. #define ACE_CHORUS_MAX_ACTORS 64 +// This is not needed when compiling for PPC. It is necessary +// for certain methods in ACE.cpp. +#if defined(sparc) && !defined(__unix) +# define __unix +#endif + #if defined(CHORUS_4) # define ACE_CHORUS_DEFAULT_MIN_STACK_SIZE 0x8000 # define ACE_HAS_4_4BSD_SENDMSG_RECVMSG |