Changeset 339 for trunk/src/emx/include/protocols

Timestamp:

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

Author:

bird

Message:

#427: FreeBSD 5.1 level.

Location:

trunk/src/emx/include/protocols

Files:

• routed.h (modified) (3 diffs, 1 prop)
• rwhod.h (modified) (2 diffs, 1 prop)
• talkd.h (modified) (1 diff, 1 prop)
• timed.h (modified) (3 diffs, 1 prop)

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

@@ -1 @@
-/*- modified for gcc/os2 by bird 2003
- *
+/*-
  * Copyright (c) 1983, 1989, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -35 +34 @@
  *
  * $FreeBSD: src/include/protocols/routed.h,v 1.15 1999/09/05 17:43:31 peter Exp $
+ *
+ * @@level      FreeBSD 5.1
+ * @@changed    bird: TCPV40HDRS, TIMER_RATE from OS/2 headers.
  */
 
@@ -40 +42 @@
 #define _ROUTED_H_
 #ifndef TCPV40HDRS
-
-/* OS2: This file is newer than the toolkit version, hope it doesn't do any harm. */
 
 #ifdef __cplusplus

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

@@ -1 @@
-/* modified for gcc/os2 by bird 2003
- *
+/*
  * Copyright (c) 1983, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -33 +32 @@
  *
  *      @(#)rwhod.h     8.1 (Berkeley) 6/2/93
+ *
+ *  @@level     FreeBSD 5.1
+ *  @@changed   bird: TCPV40HDRS, #pragma pack(1) paranoia.
  */
 

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

@@ -33 +33 @@
  *
  *      @(#)talkd.h     8.1 (Berkeley) 6/2/93
+ *
+ * @@level      FreeBSD 5.1
+ * @@changed    bird: TPCV40HDRS, #pragma pack(1) paranoia.
  */
 

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",