diff options
Diffstat (limited to 'vrt')
| -rw-r--r-- | vrt/include/vrt/bits.h | 15 | ||||
| -rw-r--r-- | vrt/include/vrt/expanded_if_context_section.h | 2 | ||||
| -rw-r--r-- | vrt/include/vrt/types.h | 8 |
3 files changed, 20 insertions, 5 deletions
diff --git a/vrt/include/vrt/bits.h b/vrt/include/vrt/bits.h index 117a4eb38..536b2740c 100644 --- a/vrt/include/vrt/bits.h +++ b/vrt/include/vrt/bits.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- */ +/* -*- c -*- */ /* * Copyright 2009,2010 Free Software Foundation, Inc. * @@ -18,6 +18,10 @@ #ifndef INCLUDED_VRT_BITS_H #define INCLUDED_VRT_BITS_H +#ifdef __cplusplus +extern "C" { +#endif + /*! * \brief Definitions of bit and fields in VRT packets * @@ -189,10 +193,10 @@ typedef struct vrt_formatted_gps_tag { //! Data Packet Payload Format Field 7.1.5.18 -typedef struct vrt_payload_format_tag { +typedef struct { uint32_t word0; uint32_t word1; -} vrt_payload_format_t; +} vrt_payload_fmt_t; #define DF0_PACKED (1 << 31) #define DF0_REAL_CMPLX_TYPE_MASK (0x3 << 29) @@ -254,7 +258,10 @@ typedef struct { vrt_velocity_t velocity_dx; // meters/s Q16.16 vrt_velocity_t velocity_dy; // meters/s Q16.16 vrt_velocity_t velocity_dz; // meters/s Q16.16 -} vrt_ecef_ephemeris_t; +} vrt_ephemeris_t; +#ifdef __cplusplus +} +#endif #endif /* INCLUDED_VRT_BITS_H */ diff --git a/vrt/include/vrt/expanded_if_context_section.h b/vrt/include/vrt/expanded_if_context_section.h index 1c82b97a5..aaa36585a 100644 --- a/vrt/include/vrt/expanded_if_context_section.h +++ b/vrt/include/vrt/expanded_if_context_section.h @@ -22,12 +22,12 @@ #define INCLUDED_VRT_EXPANDED_IF_CONTEXT_SECTION_H #include <string> +#include <vector> /*! * Expanded (unpacked) version of Context Section, defined in VRT section 7.1.5 */ - #include <stdint.h> #include <stddef.h> #include <vrt/bits.h> diff --git a/vrt/include/vrt/types.h b/vrt/include/vrt/types.h index 6e05b8eb8..2b2920266 100644 --- a/vrt/include/vrt/types.h +++ b/vrt/include/vrt/types.h @@ -18,6 +18,10 @@ #ifndef INCLUDED_VRT_TYPES_H #define INCLUDED_VRT_TYPES_H +#ifdef __cplusplus +extern "C" { +#endif + #include <stdint.h> /* macros for dealing with fixed point numbers */ @@ -180,4 +184,8 @@ vrt_gain_stage2(uint32_t field) return (vrt_db_t)((field >> 16) & 0xffff); } +#ifdef __cplusplus +} +#endif + #endif /* INCLUDED_VRT_TYPES_H */ |