kopia lustrzana https://github.com/Hamlib/Hamlib
Make pthread.h a default include and remove config.h from being included in rig.h
https://github.com/Hamlib/Hamlib/milestone/14pull/1119/head
rodzic
efd166fb50
commit
6f967a68d5
|
@ -37,10 +37,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <hamlib/config.h>
|
|
||||||
#ifdef HAVE_PTHREAD
|
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Rig list is in a separate file so as not to mess up w/ this one */
|
/* Rig list is in a separate file so as not to mess up w/ this one */
|
||||||
#include <hamlib/riglist.h>
|
#include <hamlib/riglist.h>
|
||||||
|
@ -2571,9 +2568,7 @@ struct rig_state {
|
||||||
void *async_data_handler_priv_data;
|
void *async_data_handler_priv_data;
|
||||||
volatile int poll_routine_thread_run;
|
volatile int poll_routine_thread_run;
|
||||||
void *poll_routine_priv_data;
|
void *poll_routine_priv_data;
|
||||||
#ifdef HAVE_PTHREAD
|
|
||||||
pthread_mutex_t mutex_set_transaction;
|
pthread_mutex_t mutex_set_transaction;
|
||||||
#endif
|
|
||||||
hamlib_port_t rigport; /*!< Rig port (internal use). */
|
hamlib_port_t rigport; /*!< Rig port (internal use). */
|
||||||
hamlib_port_t pttport; /*!< PTT port (internal use). */
|
hamlib_port_t pttport; /*!< PTT port (internal use). */
|
||||||
hamlib_port_t dcdport; /*!< DCD port (internal use). */
|
hamlib_port_t dcdport; /*!< DCD port (internal use). */
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#include "AESStringCrypt.h"
|
#include "AESStringCrypt.h"
|
||||||
#include "password.h"
|
#include "password.h"
|
||||||
#include "../src/misc.h"
|
#include "../src/misc.h"
|
||||||
|
#include "hamlib/config.h"
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
// gmtime_r can be defined by mingw
|
// gmtime_r can be defined by mingw
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#define _MISC_H 1
|
#define _MISC_H 1
|
||||||
|
|
||||||
#include <hamlib/rig.h>
|
#include <hamlib/rig.h>
|
||||||
|
#include <hamlib/config.h>
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Ładowanie…
Reference in New Issue