Changed GSM_API to GRGSM_API so gr_modtool created blocks don't have to be modified
This commit is contained in:
parent
044fe06f15
commit
af8ad5dddf
|
@ -20,15 +20,15 @@
|
|||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_GSM_API_H
|
||||
#define INCLUDED_GSM_API_H
|
||||
#ifndef INCLUDED_GRGSM_API_H
|
||||
#define INCLUDED_GRGSM_API_H
|
||||
|
||||
#include <gnuradio/attributes.h>
|
||||
|
||||
#ifdef gnuradio_gsm_EXPORTS
|
||||
# define GSM_API __GR_ATTR_EXPORT
|
||||
# define GRGSM_API __GR_ATTR_EXPORT
|
||||
#else
|
||||
# define GSM_API __GR_ATTR_IMPORT
|
||||
# define GRGSM_API __GR_ATTR_IMPORT
|
||||
#endif
|
||||
|
||||
#endif /* INCLUDED_GSM_API_H */
|
||||
#endif /* INCLUDED_GRGSM_API_H */
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API control_channels_decoder : virtual public gr::block
|
||||
class GRGSM_API control_channels_decoder : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<control_channels_decoder> sptr;
|
||||
|
|
|
@ -49,7 +49,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API tch_f_decoder : virtual public gr::block
|
||||
class GRGSM_API tch_f_decoder : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<tch_f_decoder> sptr;
|
||||
|
|
|
@ -37,7 +37,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API decryption : virtual public gr::block
|
||||
class GRGSM_API decryption : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<decryption> sptr;
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API tch_f_chans_demapper : virtual public gr::block
|
||||
class GRGSM_API tch_f_chans_demapper : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<tch_f_chans_demapper> sptr;
|
||||
|
|
|
@ -36,7 +36,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API universal_ctrl_chans_demapper : virtual public gr::block
|
||||
class GRGSM_API universal_ctrl_chans_demapper : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<universal_ctrl_chans_demapper> sptr;
|
||||
|
|
|
@ -41,7 +41,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API burst_fnr_filter : virtual public gr::block
|
||||
class GRGSM_API burst_fnr_filter : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<burst_fnr_filter> sptr;
|
||||
|
|
|
@ -40,7 +40,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API burst_sdcch_subslot_filter : virtual public gr::block
|
||||
class GRGSM_API burst_sdcch_subslot_filter : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<burst_sdcch_subslot_filter> sptr;
|
||||
|
|
|
@ -40,7 +40,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API burst_sdcch_subslot_splitter : virtual public gr::block
|
||||
class GRGSM_API burst_sdcch_subslot_splitter : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<burst_sdcch_subslot_splitter> sptr;
|
||||
|
|
|
@ -34,7 +34,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API burst_timeslot_filter : virtual public gr::block
|
||||
class GRGSM_API burst_timeslot_filter : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<burst_timeslot_filter> sptr;
|
||||
|
|
|
@ -34,7 +34,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API burst_timeslot_splitter : virtual public gr::block
|
||||
class GRGSM_API burst_timeslot_splitter : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<burst_timeslot_splitter> sptr;
|
||||
|
|
|
@ -34,7 +34,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API dummy_burst_filter : virtual public gr::block
|
||||
class GRGSM_API dummy_burst_filter : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<dummy_burst_filter> sptr;
|
||||
|
|
|
@ -34,7 +34,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API burst_file_sink : virtual public gr::block
|
||||
class GRGSM_API burst_file_sink : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<burst_file_sink> sptr;
|
||||
|
|
|
@ -34,7 +34,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API burst_file_source : virtual public gr::block
|
||||
class GRGSM_API burst_file_source : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<burst_file_source> sptr;
|
||||
|
|
|
@ -37,7 +37,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API bursts_printer : virtual public gr::block
|
||||
class GRGSM_API bursts_printer : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<bursts_printer> sptr;
|
||||
|
|
|
@ -34,7 +34,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API controlled_const_source_f : virtual public gr::sync_block
|
||||
class GRGSM_API controlled_const_source_f : virtual public gr::sync_block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<controlled_const_source_f> sptr;
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API controlled_rotator_cc : virtual public sync_block
|
||||
class GRGSM_API controlled_rotator_cc : virtual public sync_block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<controlled_rotator_cc> sptr;
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API extract_immediate_assignment : virtual public gr::block
|
||||
class GRGSM_API extract_immediate_assignment : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<extract_immediate_assignment> sptr;
|
||||
|
|
|
@ -36,7 +36,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API extract_system_info : virtual public gr::block
|
||||
class GRGSM_API extract_system_info : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<extract_system_info> sptr;
|
||||
|
|
|
@ -34,7 +34,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API message_file_sink : virtual public gr::block
|
||||
class GRGSM_API message_file_sink : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<message_file_sink> sptr;
|
||||
|
|
|
@ -34,7 +34,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API message_file_source : virtual public gr::block
|
||||
class GRGSM_API message_file_source : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<message_file_source> sptr;
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API message_printer : virtual public gr::block
|
||||
class GRGSM_API message_printer : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<message_printer> sptr;
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API tmsi_dumper : virtual public gr::block
|
||||
class GRGSM_API tmsi_dumper : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<tmsi_dumper> sptr;
|
||||
|
|
|
@ -34,7 +34,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API burst_sink : virtual public gr::block
|
||||
class GRGSM_API burst_sink : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<burst_sink> sptr;
|
||||
|
|
|
@ -34,7 +34,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API burst_source : virtual public gr::block
|
||||
class GRGSM_API burst_source : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<burst_source> sptr;
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API message_sink : virtual public gr::block
|
||||
class GRGSM_API message_sink : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<message_sink> sptr;
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API message_source : virtual public gr::block
|
||||
class GRGSM_API message_source : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<message_source> sptr;
|
||||
|
|
|
@ -36,7 +36,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API clock_offset_control : virtual public gr::block
|
||||
class GRGSM_API clock_offset_control : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<clock_offset_control> sptr;
|
||||
|
|
|
@ -36,7 +36,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API cx_channel_hopper : virtual public gr::block
|
||||
class GRGSM_API cx_channel_hopper : virtual public gr::block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<cx_channel_hopper> sptr;
|
||||
|
|
|
@ -38,7 +38,7 @@ namespace gr {
|
|||
* \ingroup gsm
|
||||
*
|
||||
*/
|
||||
class GSM_API receiver : virtual public sync_block
|
||||
class GRGSM_API receiver : virtual public sync_block
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr<receiver> sptr;
|
||||
|
|
|
@ -9,7 +9,7 @@ extern "C"
|
|||
{
|
||||
#endif
|
||||
|
||||
GSM_API int decode_sch(const unsigned char *buf, int * t1_o, int * t2_o, int * t3_o, int * ncc, int * bcc);
|
||||
GRGSM_API int decode_sch(const unsigned char *buf, int * t1_o, int * t2_o, int * t3_o, int * ncc, int * bcc);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* -*- c++ -*- */
|
||||
|
||||
#define GSM_API
|
||||
#define GRGSM_API
|
||||
|
||||
%include "gnuradio.i" // the common stuff
|
||||
|
||||
|
|
Loading…
Reference in New Issue