Changeset 339 for trunk/src/emx/include/protocols/timed.h

Timestamp:

Jul 10, 2003, 6:12:33 PM (22 years ago)

Author:

bird

Message:

#427: FreeBSD 5.1 level.

File:

• trunk/src/emx/include/protocols/timed.h (modified) (3 diffs, 1 prop)

trunk/src/emx/include/protocols/timed.h

@@ -33 +33 @@
  *
  *      @(#)timed.h     8.1 (Berkeley) 6/2/93
+ *
+ * $FreeBSD: src/include/protocols/timed.h,v 1.7 2002/02/03 12:00:05 markm Exp $
+ *
+ * @@level      FreeBSD 5.1
+ * @@changed    bird: TCPV40HDRS, #pragma pack(1) paranoia.
  */
 
@@ -48 +53 @@
 #pragma pack(1) /* OS2 paranoia */
 struct tsp {
-        u_char  tsp_type;
-        u_char  tsp_vers;
-        u_short tsp_seq;
+        u_int8_t        tsp_type;
+        u_int8_t        tsp_vers;
+        u_int16_t       tsp_seq;
         union {
-                struct timeval tspu_time;
+                struct {
+                        int32_t tv_sec;
+                        int32_t tv_usec;
+                } tspu_time;
                 char tspu_hopcnt;
         } tsp_u;
@@ -94 +102 @@
 
 #ifdef TSPTYPES
-char *tsptype[TSPTYPENUMBER] =
+const char *tsptype[TSPTYPENUMBER] =
   { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP",
   "SLAVEUP", "ELECTION", "ACCEPT", "REFUSE", "CONFLICT", "RESOLVE", "QUIT",