From 14686ba58329ee78455033d53f51dc12476a8b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Fillod=2C=20F8CFE?=
 <fillods@users.sourceforge.net>
Date: Wed, 23 Apr 2003 20:13:04 +0000
Subject: [PATCH] Cygwin fixes

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1451 7ae35d74-ebe9-4afe-98af-79ac388436b8
---
 include/hamlib/rig_dll.h | 13 ++-----------
 src/tones.h              |  4 ++--
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/include/hamlib/rig_dll.h b/include/hamlib/rig_dll.h
index 04067e382..80cf6e6a3 100644
--- a/include/hamlib/rig_dll.h
+++ b/include/hamlib/rig_dll.h
@@ -1,4 +1,4 @@
-/* $Id: rig_dll.h,v 1.8 2003-04-19 11:48:18 fillods Exp $ */
+/* $Id: rig_dll.h,v 1.9 2003-04-23 20:13:03 fillods Exp $ */
 
 
 /*
@@ -43,7 +43,7 @@
 #endif
 
 
-#if defined(__CYGWIN__) || defined(_WIN32)
+#if defined(_WIN32) && !defined(__CYGWIN__)
 #  undef HAMLIB_IMPEXP
 #  undef BACKEND_IMPEXP
 #  undef HAMLIB_API
@@ -90,13 +90,4 @@
 #  define BACKEND_EXPORT_VAR(type) BACKEND_IMPEXP type
 #endif
 
-#ifdef DECLARE_RIG_BACKEND
-#undef DECLARE_RIG_BACKEND
-#define DECLARE_RIG_BACKEND(backend) extern BACKEND_EXPORT(int) initrigs##API_VER##_##backend(void *be_handle)
-#endif
-
-#ifdef DECLARE_PROBERIG_BACKEND
-#undef DECLARE_PROBERIG_BACKEND
-#define DECLARE_PROBERIG_BACKEND(backend) extern BACKEND_EXPORT(rig_model_t) probeallrigs##API_VER##_##backend(port_t *p, rig_probe_func_t cfunc, rig_ptr_t data)
-#endif
 
diff --git a/src/tones.h b/src/tones.h
index 7b73f6bd7..3267391fc 100644
--- a/src/tones.h
+++ b/src/tones.h
@@ -2,7 +2,7 @@
  *  Hamlib Interface - CTCSS and DCS tables header
  *  Copyright (c) 2000-2003 by Stephane Fillod and Frank Singleton
  *
- *	$Id: tones.h,v 1.3 2003-04-19 11:49:05 fillods Exp $
+ *	$Id: tones.h,v 1.4 2003-04-23 20:13:04 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -87,7 +87,7 @@ static const tone_t static_full_dcs_list[] = {
  * These arrays cannot be shared on Win32 systems, 
  * because DLL's vars don't have constant address.
  */
-#if (defined(_WIN32) || defined(__CYGWIN__)) && defined(DLL_EXPORT) && !defined(IN_HAMLIB)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && (defined(DLL_EXPORT) || defined(__CYGWIN__)) && !defined(IN_HAMLIB)
 #define common_ctcss_list static_common_ctcss_list
 #define full_ctcss_list static_full_ctcss_list
 #define full_dcs_list static_full_dcs_list