From 341cb199e68c767d508da666806a857a129337d6 Mon Sep 17 00:00:00 2001
From: Sjoerd van der Berg <harekiet@users.sourceforge.net>
Date: Mon, 1 Sep 2003 18:19:22 +0000
Subject: [PATCH] Fix some compilation warnings

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1215
---
 src/hardware/fmopl.c       | 6 +++---
 src/hardware/softmodem.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/hardware/fmopl.c b/src/hardware/fmopl.c
index ebc97920..b4d7c8e4 100644
--- a/src/hardware/fmopl.c
+++ b/src/hardware/fmopl.c
@@ -1118,7 +1118,7 @@ static int init_tables(void)
 
 	for (x=0; x<TL_RES_LEN; x++)
 	{
-		m = (1<<16) / pow(2, (x+1) * (ENV_STEP/4.0) / 8.0);
+		m = (1<<16) / pow(2.0, (x+1) * (ENV_STEP/4.0) / 8.0);
 		m = floor(m);
 
 		/* we never reach (1<<16) here due to the (x+1) */
@@ -1158,9 +1158,9 @@ static int init_tables(void)
 		/* we never reach zero here due to ((i*2)+1) */
 
 		if (m>0.0)
-			o = 8*log(1.0/m)/log(2);	/* convert to 'decibels' */
+			o = 8*log(1.0/m)/log(2.0);	/* convert to 'decibels' */
 		else
-			o = 8*log(-1.0/m)/log(2);	/* convert to 'decibels' */
+			o = 8*log(-1.0/m)/log(2.0);	/* convert to 'decibels' */
 
 		o = o / (ENV_STEP/4);
 
diff --git a/src/hardware/softmodem.cpp b/src/hardware/softmodem.cpp
index ad11e532..38e568e1 100644
--- a/src/hardware/softmodem.cpp
+++ b/src/hardware/softmodem.cpp
@@ -79,7 +79,7 @@ struct ModemHd {
 	char remotestr[4096];
 
 	bool dialing;
-	float f1, f2;
+	double f1, f2;
 	Bitu diallen;
 	Bitu dialpos;
 	char dialstr[256];
@@ -455,7 +455,7 @@ static void MODEM_Hardware(Bitu ticks) {
 static void MODEM_CallBack(Bit8u * stream,Bit32u len) {
 	char *cp;
 	float ci,ri;
-	Bit32u innum, splitnum, quad, eighth, sixth, amp;
+	int innum, splitnum, quad, eighth, sixth, amp;
 	Bit8u curchar;
 	Bit32s buflen = (Bit32s)len;
 	if(mhd.incomingcall) {