Skip to content
Snippets Groups Projects
Commit 62827ae2 authored by rswindell's avatar rswindell
Browse files

Fixed use of _PACK macro for GNU/Linux compiler.

parent 7b1ae99f
No related branches found
No related tags found
No related merge requests found
...@@ -61,19 +61,19 @@ typedef struct { ...@@ -61,19 +61,19 @@ typedef struct {
WORD ancount; WORD ancount;
WORD nscount; WORD nscount;
WORD arcount; WORD arcount;
} _PACK dns_msghdr_t; } dns_msghdr_t _PACK;
typedef struct { typedef struct {
WORD type; WORD type;
WORD class; WORD class;
} _PACK dns_query_t; } dns_query_t _PACK;
typedef struct { typedef struct {
WORD type; WORD type;
WORD class; WORD class;
DWORD ttl; DWORD ttl;
WORD length; WORD length;
} _PACK dns_rr_t; } dns_rr_t _PACK;
#ifdef _WIN32 #ifdef _WIN32
#pragma pack(pop) /* original packing */ #pragma pack(pop) /* original packing */
......
...@@ -119,7 +119,7 @@ typedef struct { /* Node information kept in NODE.DAB */ ...@@ -119,7 +119,7 @@ typedef struct { /* Node information kept in NODE.DAB */
misc, /* Miscellaneous bits for node */ misc, /* Miscellaneous bits for node */
aux; /* Auxillary word for node */ aux; /* Auxillary word for node */
ulong extaux; /* Extended aux dword for node */ ulong extaux; /* Extended aux dword for node */
} _PACK node_t; } node_t _PACK;
#ifdef _WIN32 #ifdef _WIN32
#pragma pack(pop) /* original packing */ #pragma pack(pop) /* original packing */
......
...@@ -387,7 +387,7 @@ typedef struct { // Time with time-zone ...@@ -387,7 +387,7 @@ typedef struct { // Time with time-zone
ulong time; // Local time (unix format) ulong time; // Local time (unix format)
short zone; // Time zone short zone; // Time zone
} _PACK when_t; } when_t _PACK;
typedef struct { // Index record typedef struct { // Index record
...@@ -399,7 +399,7 @@ typedef struct { // Index record ...@@ -399,7 +399,7 @@ typedef struct { // Index record
ulong number; // number of message (1 based) ulong number; // number of message (1 based)
ulong time; // time/date message was imported/posted ulong time; // time/date message was imported/posted
} _PACK idxrec_t; } idxrec_t _PACK;
typedef struct { // Message base header (fixed portion) typedef struct { // Message base header (fixed portion)
...@@ -407,7 +407,7 @@ typedef struct { // Message base header (fixed portion) ...@@ -407,7 +407,7 @@ typedef struct { // Message base header (fixed portion)
ushort version; // version number (initially 100h for 1.00) ushort version; // version number (initially 100h for 1.00)
ushort length; // length including this struct ushort length; // length including this struct
} _PACK smbhdr_t; } smbhdr_t _PACK;
typedef struct { // Message base status header typedef struct { // Message base status header
...@@ -419,7 +419,7 @@ typedef struct { // Message base status header ...@@ -419,7 +419,7 @@ typedef struct { // Message base status header
ushort max_age; // Maximum age of message to keep in sub (in days) ushort max_age; // Maximum age of message to keep in sub (in days)
ushort attr; // Attributes for this message base (SMB_HYPER,etc) ushort attr; // Attributes for this message base (SMB_HYPER,etc)
} _PACK smbstatus_t; } smbstatus_t _PACK;
typedef struct { // Message header typedef struct { // Message header
...@@ -441,7 +441,7 @@ typedef struct { // Message header ...@@ -441,7 +441,7 @@ typedef struct { // Message header
ulong offset; // Offset for buffer into data file (0 or mod 256) ulong offset; // Offset for buffer into data file (0 or mod 256)
ushort total_dfields; // Total number of data fields ushort total_dfields; // Total number of data fields
} _PACK msghdr_t; } msghdr_t _PACK;
typedef struct { // Data field typedef struct { // Data field
...@@ -449,14 +449,14 @@ typedef struct { // Data field ...@@ -449,14 +449,14 @@ typedef struct { // Data field
ulong offset; // Offset into buffer ulong offset; // Offset into buffer
ulong length; // Length of data field ulong length; // Length of data field
} _PACK dfield_t; } dfield_t _PACK;
typedef struct { // Header field typedef struct { // Header field
ushort type; ushort type;
ushort length; // Length of buffer ushort length; // Length of buffer
} _PACK hfield_t; } hfield_t _PACK;
typedef struct { // FidoNet address (zone:net/node.point) typedef struct { // FidoNet address (zone:net/node.point)
...@@ -465,14 +465,14 @@ typedef struct { // FidoNet address (zone:net/node.point) ...@@ -465,14 +465,14 @@ typedef struct { // FidoNet address (zone:net/node.point)
ushort node; ushort node;
ushort point; ushort point;
} _PACK fidoaddr_t; } fidoaddr_t _PACK;
typedef struct { // Network (type and address) typedef struct { // Network (type and address)
ushort type; ushort type;
void *addr; void *addr;
} _PACK net_t; } net_t _PACK;
typedef struct { // Message typedef struct { // Message
...@@ -499,7 +499,7 @@ typedef struct { // Message ...@@ -499,7 +499,7 @@ typedef struct { // Message
uchar forwarded; // Forwarded from agent to another uchar forwarded; // Forwarded from agent to another
when_t expiration; // Message will exipre on this day (if >0) when_t expiration; // Message will exipre on this day (if >0)
} _PACK smbmsg_t; } smbmsg_t _PACK;
typedef struct { // Message base typedef struct { // Message base
...@@ -514,7 +514,7 @@ typedef struct { // Message base ...@@ -514,7 +514,7 @@ typedef struct { // Message base
char shd_buf[SHD_BLOCK_LEN]; // File I/O buffer for header file char shd_buf[SHD_BLOCK_LEN]; // File I/O buffer for header file
char last_error[128]; // Last error message char last_error[128]; // Last error message
} _PACK smb_t; } smb_t _PACK;
#ifdef _WIN32 #ifdef _WIN32
#pragma pack(pop) /* original packing */ #pragma pack(pop) /* original packing */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment