mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix mingw warnings from new ctcss_list definition 

https://github.com/Hamlib/Hamlib/issues/659
pull/691/head
Mike Black W9MDB 2021-04-29 17:06:45 -05:00
rodzic 386b08dc4f
commit 697a194752
1 zmienionych plików z 8 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
src/tones.h
Wyświetl plik

@ -37,7 +37,7 @@
2035, 2065, 2107, 2181, 2257, 2291, 2336, 2418, 2503, 2541, \ 2035, 2065, 2107, 2181, 2257, 2291, 2336, 2418, 2503, 2541, \
0, 0,
#if 0 #if 1
static const tone_t static_full_ctcss_list[] = static const tone_t static_full_ctcss_list[] =
{ {
FULL_CTCSS_LIST FULL_CTCSS_LIST
@ -62,7 +62,7 @@ static const tone_t static_full_ctcss_list[] =
2035, 2065, 2107, 2181, 2257, 2291, 2336, 2418, 2503, 2541, \ 2035, 2065, 2107, 2181, 2257, 2291, 2336, 2418, 2503, 2541, \
0, 0,
#if 0 #if 1
static const tone_t static_common_ctcss_list[] = static const tone_t static_common_ctcss_list[] =
{ {
COMMON_CTCSS_LIST COMMON_CTCSS_LIST
@ -87,7 +87,7 @@ static const tone_t static_common_ctcss_list[] =
662, 664, 703, 712, 723, 731, 732, 734, 743, 754, \ 662, 664, 703, 712, 723, 731, 732, 734, 743, 754, \
0, 0,
#if 0 #if 1
static const tone_t static_common_dcs_list[] = static const tone_t static_common_dcs_list[] =
{ {
COMMON_DCS_LIST COMMON_DCS_LIST
@ -111,7 +111,7 @@ static const tone_t static_common_dcs_list[] =
662, 664, 703, 712, 723, 731, 732, 734, 743, 754, \ 662, 664, 703, 712, 723, 731, 732, 734, 743, 754, \
0, 0,
#if 0 #if 1
static const tone_t static_full_dcs_list[] = static const tone_t static_full_dcs_list[] =
{ {
FULL_DCS_LIST FULL_DCS_LIST
@ -125,10 +125,10 @@ static const tone_t static_full_dcs_list[] =
* because DLL's vars don't have constant address. * because DLL's vars don't have constant address.
*/ */
#if (defined(_WIN32) || defined(__CYGWIN__)) // && !defined(IN_HAMLIB) #if (defined(_WIN32) || defined(__CYGWIN__)) // && !defined(IN_HAMLIB)
#define common_ctcss_list static_common_ctcss_list #define common_ctcss_list (tone_t*)static_common_ctcss_list
#define full_ctcss_list static_full_ctcss_list #define full_ctcss_list (tone_t*)static_full_ctcss_list
#define full_dcs_list static_full_dcs_list #define full_dcs_list (tone_t*)static_full_dcs_list
#define common_dcs_list static_common_dcs_list #define common_dcs_list (tone_t*)static_common_dcs_list
#else #else