* include/winsock2.h (int32): Remove typedef.

	(SEVICETYPE): Add typedef.
	(struct _flowspec):Revise struct definition,  Comment
	on types used for members.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index d6cf8d1ee9c685cc54649d4aa854bddb7ebfe1a5..64e8e86236e43be9073ea8fee6708821f254832c 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-02  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/winsock2.h (int32): Remove typedef.
+       (SEVICETYPE): Add typedef.
+       (struct _flowspec):Revise struct definition,  Comment
+       on types used for members.
+
 2002-05-02  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * include/winnt.h (EVENT_*, SEMAPHORE_*,MUTEX_*): Remove

diff --git a/winsup/w32api/include/winsock2.h b/winsup/w32api/include/winsock2.h
index 77c90bd5bd851a4c1664bd24f6470f9b169bb29b..cd1579aed62b1bf5b22e877297e3a8f85e4921e9 100644 (file)
--- a/winsup/w32api/include/winsock2.h
+++ b/winsup/w32api/include/winsock2.h
@@ -659,19 +659,28 @@ typedef enum
        GuaranteedService
 } GUARANTEE;
 
-typedef long int32;
+/* TODO: FLOWSPEC and related definitions belong in qos.h */
 
+/*
+   Windows Sockets 2 Application Programming Interface,
+   revision 2.2.2 (1997) uses the type uint32 for SERVICETYPE
+   and the elements of _flowspec, but the type uint32 is not defined
+   or used anywhere else in the w32api. For now, just use
+   unsigned int, which is 32 bits on _WIN32 and _WIN64.
+*/
+
+typedef unsigned int   SERVICETYPE;
 typedef struct _flowspec
 {
-       int32   TokenRate;
-       int32   TokenBucketSize;
-       int32   PeakBandwidth;
-       int32   Latency;
-       int32   DelayVariation;
-       GUARANTEE       LevelOfGuarantee;
-       int32   CostOfCall;
-       int32   NetworkAvailability;
-} FLOWSPEC, *LPFLOWSPEC;
+       unsigned int    TokenRate;
+       unsigned int    TokenBucketSize;
+       unsigned int    PeakBandwidth;
+       unsigned int    Latency;
+       unsigned int    DelayVariation;
+       SERVICETYPE     ServiceType;
+       unsigned int    MaxSduSize;
+       unsigned int    MinimumPolicedSize;
+   } FLOWSPEC, *PFLOWSPEC, *LPFLOWSPEC;
 
 typedef struct _QualityOfService
 {