Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Removed superfluous typedefs of gr_?int*; included stdint.h uncond.
Elsewhere in tree, we never check for #ifdef HAVE_STDINT_H, so this
can't make a difference here. And, we nowhere use any gr_int types, so
we don't need to drag these around.
  • Loading branch information
marcusmueller committed Jul 14, 2017
1 parent 3e1503b commit e2d611f
Showing 1 changed file with 2 additions and 24 deletions.
26 changes: 2 additions & 24 deletions gnuradio-runtime/include/gnuradio/types.h
Expand Up @@ -30,36 +30,14 @@

#include <gnuradio/gr_complex.h>

#include <stdint.h>

typedef std::vector<int> gr_vector_int;
typedef std::vector<unsigned int> gr_vector_uint;
typedef std::vector<float> gr_vector_float;
typedef std::vector<double> gr_vector_double;
typedef std::vector<void *> gr_vector_void_star;
typedef std::vector<const void *> gr_vector_const_void_star;

/*
* #include <config.h> must be placed beforehand
* in the source file including gnuradio/types.h for
* the following to work correctly
*/
#ifdef HAVE_STDINT_H
#include <stdint.h>
typedef int16_t gr_int16;
typedef int32_t gr_int32;
typedef int64_t gr_int64;
typedef uint16_t gr_uint16;
typedef uint32_t gr_uint32;
typedef uint64_t gr_uint64;
#else
/*
* Note: these defaults may be wrong on 64-bit systems
*/
typedef short gr_int16;
typedef int gr_int32;
typedef long long gr_int64;
typedef unsigned short gr_uint16;
typedef unsigned int gr_uint32;
typedef unsigned long long gr_uint64;
#endif /* HAVE_STDINT_H */

#endif /* INCLUDED_GR_TYPES_H */

0 comments on commit e2d611f

Please sign in to comment.