From 18612ad399bc79846d2a9cdc4e0f4922f5665b90 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 13 Aug 2006 13:00:49 +0200 Subject: [GCC4] fix warnings in include/net/dn_nsp.h This patch fixes these warnings with gcc 4 : In file included from dn_route.c:81: /usr/src/git/linux-2.4/include/net/dn_nsp.h:75: warning: 'packed' attribute ignored for field of type 'unsigned char' /usr/src/git/linux-2.4/include/net/dn_nsp.h:97: warning: 'packed' attribute ignored for field of type 'unsigned char' /usr/src/git/linux-2.4/include/net/dn_nsp.h:106: warning: 'packed' attribute ignored for field of type 'unsigned char' (...) --- include/net/dn_nsp.h | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/net/dn_nsp.h b/include/net/dn_nsp.h index 3948c30..094a1d1 100644 --- a/include/net/dn_nsp.h +++ b/include/net/dn_nsp.h @@ -72,9 +72,9 @@ #define NSP_DISCCONF 0x48 struct nsp_data_seg_msg { - unsigned char msgflg __attribute__((packed)); - unsigned short dstaddr __attribute__((packed)); - unsigned short srcaddr __attribute__((packed)); + unsigned char msgflg; + unsigned short dstaddr; + unsigned short srcaddr; }; struct nsp_data_opt_msg @@ -94,7 +94,7 @@ struct nsp_data_opt_msg1 /* Acknowledgment Message (data/other data) */ struct nsp_data_ack_msg { - unsigned char msgflg __attribute__((packed)); + unsigned char msgflg; unsigned short dstaddr __attribute__((packed)); unsigned short srcaddr __attribute__((packed)); unsigned short acknum __attribute__((packed)); @@ -103,7 +103,7 @@ struct nsp_data_ack_msg /* Connect Acknowledgment Message */ struct nsp_conn_ack_msg { - unsigned char msgflg __attribute__((packed)); + unsigned char msgflg; unsigned short dstaddr __attribute__((packed)); }; @@ -111,24 +111,24 @@ struct nsp_conn_ack_msg /* Connect Initiate/Retransmit Initiate/Connect Confirm */ struct nsp_conn_init_msg { - unsigned char msgflg __attribute__((packed)); + unsigned char msgflg; #define NSP_CI 0x18 /* Connect Initiate */ #define NSP_RCI 0x68 /* Retrans. Conn Init */ unsigned short dstaddr __attribute__((packed)); unsigned short srcaddr __attribute__((packed)); - unsigned char services __attribute__((packed)); + unsigned char services; #define NSP_FC_NONE 0x00 /* Flow Control None */ #define NSP_FC_SRC 0x04 /* Seg Req. Count */ #define NSP_FC_SCMC 0x08 /* Sess. Control Mess */ #define NSP_FC_MASK 0x0c /* FC type mask */ - unsigned char info __attribute__((packed)); + unsigned char info; unsigned short segsize __attribute__((packed)); }; /* Disconnect Initiate/Disconnect Confirm */ struct nsp_disconn_init_msg { - unsigned char msgflg __attribute__((packed)); + unsigned char msgflg; unsigned short dstaddr __attribute__((packed)); unsigned short srcaddr __attribute__((packed)); unsigned short reason __attribute__((packed)); @@ -138,11 +138,11 @@ struct nsp_disconn_init_msg struct srcobj_fmt { - char format __attribute__((packed)); - unsigned char task __attribute__((packed)); + char format; + unsigned char task; unsigned short grpcode __attribute__((packed)); unsigned short usrcode __attribute__((packed)); - char dlen __attribute__((packed)); + char dlen; }; /* -- 1.4.2