From 6e104f14f216138e2d85a221c0af4c34beeb5745 Mon Sep 17 00:00:00 2001 From: Nate Bargmann Date: Thu, 9 May 2013 22:02:24 -0500 Subject: [PATCH] Test for cygwin to avoid Linux specific code Compile failed on Cygwin looking for Linux specific header files. Add a preprocessor test for cygwin to only compile Windows compatible code. --- winradio/g313.c | 4 +++- winradio/linradio/wrg313api.c | 4 +++- winradio/winradio.c | 8 ++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/winradio/g313.c b/winradio/g313.c index 03b99a5d1..da8f4fb6a 100644 --- a/winradio/g313.c +++ b/winradio/g313.c @@ -28,6 +28,7 @@ #define G313_MODES (RIG_MODE_NONE) #ifdef _WIN32 +#ifdef __CYGWIN__ #ifdef HAVE_WINDOWS_H #include @@ -642,7 +643,7 @@ int g313_get_conf(RIG *rig, token_t token, char *val) return RIG_OK; } -/* end _WIN32 */ +/* end _WIN32 and __CYGWIN__ */ #else /* linux, maybe other posix */ @@ -1148,4 +1149,5 @@ const struct rig_caps g313_caps = .get_info = g313_get_info, }; +#endif /* not __CYGWIN__ */ #endif /* not _WIN32 */ diff --git a/winradio/linradio/wrg313api.c b/winradio/linradio/wrg313api.c index fdc7d8e7e..6da279328 100644 --- a/winradio/linradio/wrg313api.c +++ b/winradio/linradio/wrg313api.c @@ -1,4 +1,5 @@ #ifndef _WIN32 +#ifndef __CYGWIN__ #include #include @@ -168,4 +169,5 @@ void UninitAPI(void) } } -#endif +#endif /* not __CYGWIN__ */ +#endif /* not _WIN32 */ diff --git a/winradio/winradio.c b/winradio/winradio.c index 379781ce3..a4bd38395 100644 --- a/winradio/winradio.c +++ b/winradio/winradio.c @@ -246,10 +246,18 @@ DECLARE_INITRIG_BACKEND(winradio) /* Receivers with DLL only available under Windows */ #ifdef _WIN32 +#ifdef __CYGWIN__ rig_register(&g303_caps); rig_register(&g305_caps); #endif +#endif + + /* Not available on MS Windows */ +#ifndef _WIN32 +#ifndef __CYGWIN__ rig_register(&g313_caps); +#endif +#endif return RIG_OK; }