rpms/dosbox/devel dosbox-x86-64-build.patch, 1.1, 1.2 dosbox.spec, 1.9, 1.10

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/dosbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12917

Modified Files:
	dosbox-x86-64-build.patch dosbox.spec 
Log Message:
- more x86_64 build fixes


dosbox-x86-64-build.patch:

Index: dosbox-x86-64-build.patch
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox-x86-64-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dosbox-x86-64-build.patch	22 May 2005 22:25:01 -0000	1.1
+++ dosbox-x86-64-build.patch	30 May 2005 07:21:00 -0000	1.2
@@ -9,3 +9,18 @@
  		char* endPos		= strchr(cpos,'.');
  		Bitu numberSize		= endPos ? int(endPos)-int(cpos) : strlen(cpos);
  		
+--- src/dos/drive_cache.cpp.orig	2005-05-30 08:53:27.000000000 +0200
++++ src/dos/drive_cache.cpp	2005-05-30 08:55:47.000000000 +0200
+@@ -319,10 +319,10 @@
+ 	if (cpos) {
+ 		Bits compareCount1	= (int)cpos - (int)shortName;
+ 		char* endPos		= strchr(cpos,'.');
+-		Bitu numberSize		= endPos ? int(endPos)-int(cpos) : strlen(cpos);
++		Bitu numberSize		= endPos ? size_t(endPos)-size_t(cpos) : strlen(cpos);
+ 		
+ 		char* lpos			= strchr(compareName,'.');
+-		Bits compareCount2	= lpos ? int(lpos)-int(compareName) : strlen(compareName);
++		Bits compareCount2	= lpos ? size_t(lpos)-size_t(compareName) : strlen(compareName);
+ 		if (compareCount2>8) compareCount2 = 8;
+ 
+ 		compareCount2 -= numberSize;


Index: dosbox.spec
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dosbox.spec	22 May 2005 22:25:01 -0000	1.9
+++ dosbox.spec	30 May 2005 07:21:00 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           dosbox
 Version:        0.63
-Release:        3
+Release:        4
 
 Summary:        x86/DOS emulator with sound and graphics
 
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- more x86_64 build fixes...
+
 * Mon May 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.63-3
 - fix x86_64 build (#158446)