diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-15 23:04:02 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-15 23:04:02 +0000 |
| commit | 36efdea1a445a072a4ceb96b0cff9f856ecdebfe (patch) | |
| tree | 57c59044833c3599acc8e67e6fdeac564194649f | |
| parent | 1f7176bc66a435c1443e0d92e1c66919ad1a7290 (diff) | |
| download | ATCD-36efdea1a445a072a4ceb96b0cff9f856ecdebfe.tar.gz | |
ChangeLogTag:Tue Jun 15 17:55:04 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 9 | ||||
| -rw-r--r-- | ace/OS.i | 12 |
2 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 335c4c14ca4..ac61185d22d 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,12 @@ +Tue Jun 15 17:55:04 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * ace/OS.i: + Several fields of the FLOWSPEC structure are not present in the + terminal server version of Winsock2, they are only used if + ACE_HAS_WINNT5 is defined, the macro is *not* automatically + defined because we couldn't figure out a way to automagically + determine the OS version. + Tue Jun 15 17:41:38 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ACE-INSTALL.html: Updated the documentation to recommend @@ -4290,7 +4290,7 @@ ACE_Flow_Spec::delay_variation (u_long dv) ACE_INLINE ACE_SERVICE_TYPE ACE_Flow_Spec::service_type (void) { -#if defined (ACE_HAS_WINSOCK2) +#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINNT5) return this->ServiceType; #else ACE_NOTSUP_RETURN (0); @@ -4300,7 +4300,7 @@ ACE_Flow_Spec::service_type (void) ACE_INLINE void ACE_Flow_Spec::service_type (ACE_SERVICE_TYPE st) { -#if defined (ACE_HAS_WINSOCK2) +#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINNT5) this->ServiceType = st; #else ACE_UNUSED_ARG (st); @@ -4310,7 +4310,7 @@ ACE_Flow_Spec::service_type (ACE_SERVICE_TYPE st) ACE_INLINE u_long ACE_Flow_Spec::max_sdu_size (void) { -#if defined (ACE_HAS_WINSOCK2) +#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINNT5) return this->MaxSduSize; #else ACE_NOTSUP_RETURN (0); @@ -4320,7 +4320,7 @@ ACE_Flow_Spec::max_sdu_size (void) ACE_INLINE void ACE_Flow_Spec::max_sdu_size (u_long mss) { -#if defined (ACE_HAS_WINSOCK2) +#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINNT5) this->MaxSduSize = mss; #else ACE_UNUSED_ARG (mss); @@ -4330,7 +4330,7 @@ ACE_Flow_Spec::max_sdu_size (u_long mss) ACE_INLINE u_long ACE_Flow_Spec::minimum_policed_size (void) { -#if defined (ACE_HAS_WINSOCK2) +#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINNT5) return this->MinimumPolicedSize; #else ACE_NOTSUP_RETURN (0); @@ -4340,7 +4340,7 @@ ACE_Flow_Spec::minimum_policed_size (void) ACE_INLINE void ACE_Flow_Spec::minimum_policed_size (u_long mps) { -#if defined (ACE_HAS_WINSOCK2) +#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINNT5) this->MinimumPolicedSize = mps; #else ACE_UNUSED_ARG (mps); |