Fix MSVC 2003 build

libretro · Mar 15, 2018 · 75e5e10 · 75e5e10
1 parent db65fb8
commit 75e5e10
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/nes_emu/Mapper_Vrc7.cpp b/nes_emu/Mapper_Vrc7.cpp
@@ -35,8 +35,6 @@ struct vrc7_state_t
 BOOST_STATIC_ASSERT( sizeof (vrc7_state_t) == 18 + sizeof (vrc7_snapshot_t) );
 
 class Mapper_Vrc7 : public Nes_Mapper, vrc7_state_t {
-	Nes_Vrc7 sound;
-	enum { timer_period = 113 * 4 + 3 };
 public:
 	Mapper_Vrc7()
 	{
@@ -215,6 +213,9 @@ class Mapper_Vrc7 : public Nes_Mapper, vrc7_state_t {
 				break;
 		}
 	}
+
+	Nes_Vrc7 sound;
+	enum { timer_period = 113 * 4 + 3 };
 };
 
 void register_vrc7_mapper();

diff --git a/nes_emu/emu2413.cpp b/nes_emu/emu2413.cpp
@@ -146,7 +146,7 @@ static void makeDB2LinTable (OPLL * opll)
 
   for (i = 0; i < DB_MUTE + DB_MUTE; i++)
   {
-    opll->DB2LIN_TABLE[i] = (e_int16) ((double) ((1 << DB2LIN_AMP_BITS) - 1) * pow (10, -(double) i * DB_STEP / 20));
+    opll->DB2LIN_TABLE[i] = (e_int16) ((double) ((1 << DB2LIN_AMP_BITS) - 1) * powf(10, -(double) i * DB_STEP / 20));
     if (i >= DB_MUTE) opll->DB2LIN_TABLE[i] = 0;
     //printf("%d\n",DB2LIN_TABLE[i]);
     opll->DB2LIN_TABLE[i + DB_MUTE + DB_MUTE] = (e_int16) (-opll->DB2LIN_TABLE[i]);
@@ -195,7 +195,7 @@ static void makePmTable (OPLL * opll)
   e_int32 i;
 
   for (i = 0; i < PM_PG_WIDTH; i++)
-    opll->pmtable[i] = (e_int32) ((double) PM_AMP * pow (2, (double) PM_DEPTH * sin (2.0 * PI * i / PM_PG_WIDTH) / 1200));
+    opll->pmtable[i] = (e_int32) ((double) PM_AMP * powf(2, (double) PM_DEPTH * sin (2.0 * PI * i / PM_PG_WIDTH) / 1200));
 }
 
 /* Table for Amp Modulator */