more win32 efforts

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@566 7ae35d74-ebe9-4afe-98af-79ac388436b8

alinco/alinco.h

@@ -6,7 +6,7 @@
  * via serial interface to a Alinco radio.
  *
  *
- *    $Id: alinco.h,v 1.2 2001-06-15 07:08:37 f4cfe Exp $  
+ *    $Id: alinco.h,v 1.3 2001-06-20 06:08:21 f4cfe Exp $  
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -28,17 +28,17 @@
 #ifndef _ALINCO_H
 #define _ALINCO_H 1
 
-#if defined(__CYGWIN__) && defined(HAMLIB_DLL)
+#if defined(__CYGWIN__)
 #  undef HAMLIB_DLL
 #  include <hamlib/rig.h>
+#  include <cal.h>
 #  define HAMLIB_DLL
 #  include <hamlib/rig_dll.h>
 #else
 #  include <hamlib/rig.h>
+#  include <cal.h>
 #endif
 
-#include <cal.h>
-
 struct alinco_priv_caps {
 	cal_table_t str_cal;
 };

aor/aor.c

@@ -6,7 +6,7 @@
  * via serial interface to an AOR scanner.
  *
  *
- * $Id: aor.c,v 1.10 2001-06-15 07:08:37 f4cfe Exp $  
+ * $Id: aor.c,v 1.11 2001-06-20 06:08:21 f4cfe Exp $  
  *
  *
  *
@@ -36,7 +36,7 @@
 #include <sys/ioctl.h>
 #include <math.h>
 
-#if defined(__CYGWIN__) && defined(HAMLIB_DLL)
+#if defined(__CYGWIN__)
 #  undef HAMLIB_DLL
 #  include <hamlib/rig.h>
 #  include <serial.h>

dummy/dummy.c

@@ -7,7 +7,7 @@
  * purpose mainly.
  *
  *
- *	$Id: dummy.c,v 1.11 2001-06-15 07:08:37 f4cfe Exp $
+ *	$Id: dummy.c,v 1.12 2001-06-20 06:08:21 f4cfe Exp $
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@
 #include <sys/ioctl.h>
 #include <math.h>
 
-#if defined(__CYGWIN__) && defined(HAMLIB_DLL)
+#if defined(__CYGWIN__)
 #  undef HAMLIB_DLL
 #  include <hamlib/rig.h>
 #  include <serial.h>

icom/icom.c

@@ -6,7 +6,7 @@
  * via serial interface to an ICOM using the "CI-V" interface.
  *
  *
- * $Id: icom.c,v 1.30 2001-06-15 07:08:37 f4cfe Exp $  
+ * $Id: icom.c,v 1.31 2001-06-20 06:08:21 f4cfe Exp $  
  *
  *
  *
@@ -36,7 +36,7 @@
 #include <sys/ioctl.h>
 #include <math.h>
 
-#if defined(__CYGWIN__) && defined(HAMLIB_DLL)
+#if defined(__CYGWIN__)
 #  undef HAMLIB_DLL
 #  include <hamlib/rig.h>
 #  include <serial.h>

kenwood/kenwood.c

@@ -6,7 +6,7 @@
  * via serial interface to a Kenwood radio.
  *
  *
- * $Id: kenwood.c,v 1.10 2001-06-15 07:08:37 f4cfe Exp $  
+ * $Id: kenwood.c,v 1.11 2001-06-20 06:08:21 f4cfe Exp $  
  *
  *
  *
@@ -36,7 +36,7 @@
 #include <sys/ioctl.h>
 #include <math.h>
 
-#if defined(__CYGWIN__) && defined(HAMLIB_DLL)
+#if defined(__CYGWIN__)
 #  undef HAMLIB_DLL
 #  include <hamlib/rig.h>
 #  include <serial.h>

pcr/pcr.c

@@ -6,7 +6,7 @@
  * via serial interface to an Icom PCR-1xxx radio.
  *
  *
- *	$Id: pcr.c,v 1.7 2001-06-15 07:08:37 f4cfe Exp $  
+ *	$Id: pcr.c,v 1.8 2001-06-20 06:08:21 f4cfe Exp $  
  *
  *
  *
@@ -36,7 +36,7 @@
 #include <sys/ioctl.h>
 #include <math.h>
 
-#if defined(__CYGWIN__) && defined(HAMLIB_DLL)
+#if defined(__CYGWIN__)
 #  undef HAMLIB_DLL
 #  include <hamlib/rig.h>
 #  include <serial.h>

src/cal.c

@@ -4,7 +4,7 @@
  * cal.c - Copyright (C) 2001 Stephane Fillod
  *
  *
- *		$Id: cal.c,v 1.1 2001-03-04 12:54:12 f4cfe Exp $  
+ *		$Id: cal.c,v 1.2 2001-06-20 06:08:21 f4cfe Exp $  
  *
  *
  *
@@ -24,6 +24,8 @@
  * 
  */
 
+#define HAMLIB_DLL
+#include <hamlib/rig.h>
 #include "cal.h"
 
 /* add rig_set_cal(cal_table), rig_get_calstat(rawmin,rawmax,cal_table), */

winradio/winradio.c

@@ -8,7 +8,7 @@
  * /dev/winradio API.
  *
  *
- *		$Id: winradio.c,v 1.11 2001-06-15 07:08:37 f4cfe Exp $
+ *		$Id: winradio.c,v 1.12 2001-06-20 06:08:22 f4cfe Exp $
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@
 #include <sys/ioctl.h>
 #include <math.h>
 
-#if defined(__CYGWIN__) && defined(HAMLIB_DLL)
+#if defined(__CYGWIN__)
 #  undef HAMLIB_DLL
 #  include <hamlib/rig.h>
 #  include <serial.h>

yaesu/yaesu.c

@@ -7,7 +7,7 @@
  * via serial interface to a Yaesu rig
  *
  *
- *	$Id: yaesu.c,v 1.2 2001-06-15 07:08:37 f4cfe Exp $  
+ *	$Id: yaesu.c,v 1.3 2001-06-20 06:08:22 f4cfe Exp $  
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@
 #include <termios.h> /* POSIX terminal control definitions */
 #include <sys/ioctl.h>
 
-#if defined(__CYGWIN__) && defined(HAMLIB_DLL)
+#if defined(__CYGWIN__)
 #  undef HAMLIB_DLL
 #  include <hamlib/rig.h>
 #  include "serial.h"