Changeset d3376d5


Ignore:
Timestamp:
02/19/19 09:48:02 (19 months ago)
Author:
Shane Alcock <salcock@…>
Branches:
develop
Children:
450d198
Parents:
3621e1c
Message:

Move dag_sec_t and dag_opthdr structures into format_erf.h

They were previously added to dagformat.h, but this header is not
included if the DAG libraries are present. This meant libtrace
would fail to build for DAG users.

Location:
lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lib/dagformat.h

    r4e5a51f rd3376d5  
    104104} PACKED dag_record_t;
    105105
    106 typedef struct dag_section_header {
    107         uint16_t type;
    108         uint16_t len;
    109 } PACKED dag_sec_t;
    110 
    111 struct dag_opthdr {
    112         uint16_t optcode;
    113         uint16_t optlen;
    114 } PACKED;
    115 
    116106#ifdef WIN32
    117107#pragma pack(pop)
  • lib/format_erf.h

    r0af3a4e rd3376d5  
    112112 */
    113113
     114typedef struct dag_section_header {
     115        uint16_t type;
     116        uint16_t len;
     117} PACKED dag_sec_t;
     118
     119struct dag_opthdr {
     120        uint16_t optcode;
     121        uint16_t optlen;
     122} PACKED;
     123
    114124int erf_get_framing_length(const libtrace_packet_t *packet);
    115125libtrace_linktype_t erf_get_link_type(const libtrace_packet_t *packet);
Note: See TracChangeset for help on using the changeset viewer.