diff options
author | Ben Pfaff <blp@nicira.com> | 2010-02-12 13:56:12 -0800 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2010-02-12 13:56:12 -0800 |
commit | 381328fe36480b63a73cd5b164047e27622e772f (patch) | |
tree | 510cc92e3936033816df9dc29de599a9da580fec /lib/pcap.c | |
parent | 68d1c8c3c3de2f2dc093901d4d83567a37375bc4 (diff) |
compiler: Remove PACKED macro and its only (unneeded) user.
There is no point in marking a well-aligned structure PACKED. It can only
cause trouble.
Diffstat (limited to 'lib/pcap.c')
-rw-r--r-- | lib/pcap.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,14 +34,16 @@ struct pcap_hdr { uint32_t sigfigs; /* accuracy of timestamps */ uint32_t snaplen; /* max length of captured packets */ uint32_t network; /* data link type */ -} PACKED; +}; +BUILD_ASSERT_DECL(sizeof(struct pcap_hdr) == 24); struct pcaprec_hdr { uint32_t ts_sec; /* timestamp seconds */ uint32_t ts_usec; /* timestamp microseconds */ uint32_t incl_len; /* number of octets of packet saved in file */ uint32_t orig_len; /* actual length of packet */ -} PACKED; +}; +BUILD_ASSERT_DECL(sizeof(struct pcaprec_hdr) == 16); FILE * pcap_open(const char *file_name, const char *mode) |