[Scummvm-cvs-logs] CVS: scummvm/common file.cpp,1.79,1.80 savefile.cpp,1.23,1.24 scummsys.h,1.57,1.58 stdafx.h,1.26,1.27

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31171/common

Modified Files:
	file.cpp savefile.cpp scummsys.h stdafx.h 
Log Message:
Patch #1181544 (AmigaOS 4 changes)

Index: file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- file.cpp	23 Apr 2005 09:21:41 -0000	1.79
+++ file.cpp	9 May 2005 21:21:18 -0000	1.80
@@ -85,6 +85,17 @@
 		file = fopen(buf, mode);
 	}
 
+#ifdef __amigaos4__
+	//
+	// Work around for possibility that someone uses AmigaOS "newlib" build with SmartFileSystem (blocksize 512 bytes), leading
+	// to buffer size being only 512 bytes. "Clib2" sets the buffer size to 8KB, resulting smooth movie playback. This forces the buffer
+	// to be enough also when using "newlib" compile on SFS.
+	//
+	if (file) {
+		setvbuf(file, NULL, _IOFBF, 8192);
+	}
+#endif
+
 	return file;
 }
 

Index: savefile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/savefile.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- savefile.cpp	8 May 2005 23:45:17 -0000	1.23
+++ savefile.cpp	9 May 2005 21:21:18 -0000	1.24
@@ -156,7 +156,7 @@
 	const int dirLen = strlen(buf);
 
 	if (dirLen > 0) {
-#ifdef __MORPHOS__
+#if defined(__MORPHOS__) || defined(__amigaos4__)
 		if (buf[dirLen-1] != ':' && buf[dirLen-1] != '/')
 #endif
 

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scummsys.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- scummsys.h	31 Mar 2005 05:35:03 -0000	1.57
+++ scummsys.h	9 May 2005 21:21:18 -0000	1.58
@@ -323,6 +323,32 @@
 	#define fsize(a)			ps2_fsize(a)
 
 	extern void ps2_disableHandleCaching(void);
+
+#elif defined (__amigaos4__)
+	#include <exec/types.h>
+
+	#define	scumm_stricmp strcasecmp
+	#define	scumm_strnicmp strncasecmp
+
+	#define	CHECK_HEAP
+
+	#define	SCUMM_BIG_ENDIAN
+
+	// You need to set this manually if necessary
+	#define	SCUMM_NEED_ALIGNMENT
+
+	#define	FORCEINLINE	inline
+	#define	CDECL
+
+	#ifndef	HAVE_CONFIG_H
+	typedef	unsigned char byte;
+	typedef	unsigned int uint;
+	#endif
+
+	#define	START_PACK_STRUCTS
+	#define	END_PACK_STRUCTS
+	#define	GCC_PACK __attribute__((packed))
+	#define	NORETURN __attribute__((__noreturn__))
 #else
 	#error No system type defined
 #endif

Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/stdafx.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- stdafx.h	31 Mar 2005 05:35:03 -0000	1.26
+++ stdafx.h	9 May 2005 21:21:18 -0000	1.27
@@ -111,11 +111,13 @@
 #endif
 #if !defined(macintosh)
 #include <sys/types.h>
-#if !defined(__PLAYSTATION2__)
+#if !defined(__PLAYSTATION2__) && !defined(__amigaos4__)
 #include <sys/uio.h>
 #endif
+#if !defined(__amigaos4__)
 #include <sys/param.h>
 #endif
+#endif
 #if !defined (__BEOS__)
 #include <unistd.h>
 #endif