[Scummvm-cvs-logs] CVS: scummvm/gui credits.h,1.10,1.11 options.cpp,1.76,1.77

[Max Horn]

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

Modified Files:
	credits.h options.cpp 
Log Message:
Patch #1181544 (AmigaOS 4 changes)

Index: credits.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/credits.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- credits.h	9 May 2005 00:11:08 -0000	1.10
+++ credits.h	9 May 2005 21:21:20 -0000	1.11
@@ -42,6 +42,8 @@
 "\\L\\c2""    MT-32 emulator",
 "\\L\\c0""  Jochen Hoenicke",
 "\\L\\c2""    Speaker & PCjr sound support, Adlib work",
+"\\L\\c0""  Hans-Jorg Frieden",
+"\\L\\c2""    Port: AmigaOS 4",
 "\\L\\c0""",
 "\\C\\c1""Retired Team Members:",
 "\\L\\c0""  Ralph Brorsen",
@@ -101,6 +103,8 @@
 "\\L\\c2""    SDL-based OpenGL renderer",
 "\\L\\c0""  Tim ???",
 "\\L\\c2""    Initial MI1 CD music support",
+"\\L\\c0""  Juha Niemimaki",
+"\\L\\c2""    AmigaOS 4 port maintaining",
 "\\L\\c0""",
 "\\L\\c0""And to all the contributors, users, and beta",
 "\\L\\c0""testers we've missed. Thanks!",

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- options.cpp	22 Apr 2005 21:20:22 -0000	1.76
+++ options.cpp	9 May 2005 21:21:21 -0000	1.77
@@ -33,7 +33,7 @@
 #include "sound/mididrv.h"
 #include "sound/mixer.h"
 
-#if (!( defined(__PALM_OS__) || defined(__DC__) || defined(__GP32__)) && !defined(_MSC_VER))
+#if (!( defined(__PALM_OS__) || defined(__DC__) || defined(__GP32__) || defined(__amigaos4__) ) && !defined(_MSC_VER))
 #include <sys/param.h>
 #include <unistd.h>
 #endif