# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1197882293 -32400
# Node ID 240bdf781ad0000cb8d8ecdb8a86a09747c856a5
# Parent  c4cd92ff8d53eb3d66cd60649408e6b7f784c0c9
eliminate warnings on x86_64.

diff -r c4cd92ff8d53 -r 240bdf781ad0 src/console/Blip_Buffer.cxx
--- a/src/console/Blip_Buffer.cxx	Sun Dec 16 21:00:58 2007 +0900
+++ b/src/console/Blip_Buffer.cxx	Mon Dec 17 18:04:53 2007 +0900
@@ -27,7 +27,7 @@
 
 Blip_Buffer::Blip_Buffer()
 {
-	factor_       = LONG_MAX;
+	factor_       = UINT_MAX;
 	offset_       = 0;
 	buffer_       = 0;
 	buffer_size_  = 0;
diff -r c4cd92ff8d53 -r 240bdf781ad0 src/console/Blip_Buffer.h
--- a/src/console/Blip_Buffer.h	Sun Dec 16 21:00:58 2007 +0900
+++ b/src/console/Blip_Buffer.h	Mon Dec 17 18:04:53 2007 +0900
@@ -8,7 +8,7 @@
 	#include <limits.h>
 	#if INT_MAX >= 0x7FFFFFFF
 		typedef int blip_long;
-		typedef unsigned blip_ulong;
+		typedef unsigned int blip_ulong;
 	#else
 		typedef long blip_long;
 		typedef unsigned long blip_ulong;
diff -r c4cd92ff8d53 -r 240bdf781ad0 src/console/Hes_Cpu.h
--- a/src/console/Hes_Cpu.h	Sun Dec 16 21:00:58 2007 +0900
+++ b/src/console/Hes_Cpu.h	Mon Dec 17 18:04:53 2007 +0900
@@ -8,7 +8,7 @@
 
 typedef blargg_long hes_time_t; // clock cycle count
 typedef unsigned hes_addr_t; // 16-bit address
-enum { future_hes_time = LONG_MAX / 2 + 1 };
+enum { future_hes_time = INT_MAX / 2 + 1 };
 
 class Hes_Cpu {
 public:
diff -r c4cd92ff8d53 -r 240bdf781ad0 src/console/Music_Emu.cxx
--- a/src/console/Music_Emu.cxx	Sun Dec 16 21:00:58 2007 +0900
+++ b/src/console/Music_Emu.cxx	Mon Dec 17 18:04:53 2007 +0900
@@ -33,7 +33,7 @@
 	emu_time         = 0;
 	emu_track_ended_ = true;
 	track_ended_     = true;
-	fade_start       = LONG_MAX / 2 + 1;
+	fade_start       = INT_MAX / 2 + 1;
 	fade_step        = 1;
 	silence_time     = 0;
 	silence_count    = 0;
diff -r c4cd92ff8d53 -r 240bdf781ad0 src/console/Nes_Apu.h
--- a/src/console/Nes_Apu.h	Sun Dec 16 21:00:58 2007 +0900
+++ b/src/console/Nes_Apu.h	Mon Dec 17 18:04:53 2007 +0900
@@ -78,7 +78,7 @@
 	// Get time that APU-generated IRQ will occur if no further register reads
 	// or writes occur. If IRQ is already pending, returns irq_waiting. If no
 	// IRQ will occur, returns no_irq.
-	enum { no_irq = LONG_MAX / 2 + 1 };
+	enum { no_irq = INT_MAX / 2 + 1 };
 	enum { irq_waiting = 0 };
 	nes_time_t earliest_irq( nes_time_t ) const;
 	
diff -r c4cd92ff8d53 -r 240bdf781ad0 src/console/Nes_Cpu.h
--- a/src/console/Nes_Cpu.h	Sun Dec 16 21:00:58 2007 +0900
+++ b/src/console/Nes_Cpu.h	Mon Dec 17 18:04:53 2007 +0900
@@ -8,7 +8,7 @@
 
 typedef blargg_long nes_time_t; // clock cycle count
 typedef unsigned nes_addr_t; // 16-bit address
-enum { future_nes_time = LONG_MAX / 2 + 1 };
+enum { future_nes_time = INT_MAX / 2 + 1 };
 
 class Nes_Cpu {
 public:
diff -r c4cd92ff8d53 -r 240bdf781ad0 src/console/Sap_Cpu.h
--- a/src/console/Sap_Cpu.h	Sun Dec 16 21:00:58 2007 +0900
+++ b/src/console/Sap_Cpu.h	Mon Dec 17 18:04:53 2007 +0900
@@ -8,7 +8,7 @@
 
 typedef blargg_long sap_time_t; // clock cycle count
 typedef unsigned sap_addr_t; // 16-bit address
-enum { future_sap_time = LONG_MAX / 2 + 1 };
+enum { future_sap_time = INT_MAX / 2 + 1 };
 
 class Sap_Cpu {
 public: