This commit was generated by cvs2svn to compensate for changes in r133492,

which included commits to RCS files with non-trunk default branches.

2 files changed, 13 insertions, 12 deletions

diff --git a/sys/contrib/ngatm/netnatm/msg/uni_ie.c b/sys/contrib/ngatm/netnatm/msg/uni_ie.c
index a9d5eca..100fe81 100644
--- a/sys/contrib/ngatm/netnatm/msg/uni_ie.c
+++ b/sys/contrib/ngatm/netnatm/msg/uni_ie.c
@@ -26,7 +26,7 @@
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
  *
- * $Begemot: libunimsg/netnatm/msg/uni_ie.c,v 1.14 2004/07/08 08:22:06 brandt Exp $
+ * $Begemot: libunimsg/netnatm/msg/uni_ie.c,v 1.15 2004/08/05 07:10:59 brandt Exp $
  *
  * Private definitions for the IE code file.
  *
@@ -792,11 +792,11 @@ uni_print_cx(char *buf, size_t size, struct unicx *cx)
 	};
 
 	static const char *errtab[] = {
-		[UNI_IERR_UNK] "unk",	/* unknown IE */
-		[UNI_IERR_LEN] "len",	/* length error */
-		[UNI_IERR_BAD] "bad",	/* content error */
-		[UNI_IERR_ACC] "acc",	/* access element discarded */
-		[UNI_IERR_MIS] "mis",	/* missing IE */
+		[UNI_IERR_UNK] = "unk",	/* unknown IE */
+		[UNI_IERR_LEN] = "len",	/* length error */
+		[UNI_IERR_BAD] = "bad",	/* content error */
+		[UNI_IERR_ACC] = "acc",	/* access element discarded */
+		[UNI_IERR_MIS] = "mis",	/* missing IE */
 	};
 
 	u_int i;
@@ -844,7 +844,7 @@ static const struct causetab {
 	enum uni_diag	diag;
 } itu_causes[128] = {
 
-#define D(NAME,VAL,DIAG,STD,STR) [UNI_CAUSE_##NAME] { STR, UNI_DIAG_##DIAG },
+#define D(NAME,VAL,DIAG,STD,STR) [UNI_CAUSE_##NAME] = { STR, UNI_DIAG_##DIAG },
 #define N(NAME,VAL,DIAG,STD,STR)
 
 UNI_DECLARE_CAUSE_VALUES
@@ -855,7 +855,7 @@ UNI_DECLARE_CAUSE_VALUES
 }, net_causes[128] = {
 
 #define D(NAME,VAL,DIAG,STD,STR)
-#define N(NAME,VAL,DIAG,STD,STR) [UNI_CAUSE_##NAME] { STR, UNI_DIAG_##DIAG },
+#define N(NAME,VAL,DIAG,STD,STR) [UNI_CAUSE_##NAME] = { STR, UNI_DIAG_##DIAG },
 
 UNI_DECLARE_CAUSE_VALUES
 
diff --git a/sys/contrib/ngatm/netnatm/msg/unistruct.h b/sys/contrib/ngatm/netnatm/msg/unistruct.h
index 819f275..ceb1f5b 100644
--- a/sys/contrib/ngatm/netnatm/msg/unistruct.h
+++ b/sys/contrib/ngatm/netnatm/msg/unistruct.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: libunimsg/netnatm/msg/unistruct.h,v 1.6 2004/07/08 08:22:08 brandt Exp $
+ * $Begemot: libunimsg/netnatm/msg/unistruct.h,v 1.7 2004/07/16 18:42:22 brandt Exp $
  *
  * This file defines all structures that are used by
  * API users.
@@ -206,10 +206,11 @@ enum uni_addr_screen {
 	UNI_ADDR_SCREEN_NET	= 0x3,
 };
 
+/* don't use bitfields to get a defined structure layout */
 struct uni_addr {
-	enum uni_addr_type	type;
-	enum uni_addr_plan	plan;
-	u_int			len;
+	uint8_t			type;
+	uint8_t			plan;
+	uint8_t			len;
 	u_char			addr[UNI_ADDR_MAXLEN];
 };
 struct uni_subaddr {