[Scummvm-cvs-logs] SF.net SVN: scummvm:[34340] scummvm/trunk

[anotherguest at users.sourceforge.net]

Revision: 34340
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34340&view=rev
Author:   anotherguest
Date:     2008-09-05 11:31:51 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
Updated Symbian OS file actions with ferror and fflush.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
    scummvm/trunk/backends/platform/symbian/src/SymbianOS.h
    scummvm/trunk/backends/platform/symbian/src/portdefs.h
    scummvm/trunk/common/file.cpp

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2008-09-05 11:09:29 UTC (rev 34339)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2008-09-05 11:31:51 UTC (rev 34340)
@@ -672,6 +672,14 @@
 void symbian_clearerr(FILE* /*handle*/) {
 }
 
+void	symbian_fflush(FILE* handle) {
+	((TSymbianFileEntry*)(handle))->iFileHandle.Flush();
+}
+
+int     symbian_ferror(FILE* /*handle*/) {
+	return 0;
+}
+
 /** Vibration support */
 #ifdef  USE_VIBRA_SE_PXXX
 void OSystem_SDL_Symbian::initializeVibration() {

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.h	2008-09-05 11:09:29 UTC (rev 34339)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.h	2008-09-05 11:31:51 UTC (rev 34340)
@@ -63,6 +63,9 @@
 
 	// Overloaded from SDL_Commmon
 	void quit();
+
+	// Returns reference to File session
+	RFs& FsSession();
 protected:
 	//
 	// The mixer callback function, passed on to OSystem::setSoundCallback().

Modified: scummvm/trunk/backends/platform/symbian/src/portdefs.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/portdefs.h	2008-09-05 11:09:29 UTC (rev 34339)
+++ scummvm/trunk/backends/platform/symbian/src/portdefs.h	2008-09-05 11:31:51 UTC (rev 34340)
@@ -156,6 +156,5 @@
 namespace Symbian {
 extern void FatalError(const char *msg);
 extern char* GetExecutablePath();
-#define DYNAMIC_MODULES 1
 }
 #endif

Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp	2008-09-05 11:09:29 UTC (rev 34339)
+++ scummvm/trunk/common/file.cpp	2008-09-05 11:31:51 UTC (rev 34340)
@@ -122,7 +122,8 @@
 	long int symbian_ftell(FILE* handle);
 	int		symbian_fseek(FILE* handle, long int offset, int whence);
 	void	symbian_clearerr(FILE* handle);
-
+	void	symbian_fflush(FILE* handle);
+	int     symbian_ferror(FILE* handle);
 	// Only functions used in the ScummVM source have been defined here!
 	#define fopen(name, mode)					symbian_fopen(name, mode)
 	#define fclose(handle)						symbian_fclose(handle)
@@ -132,6 +133,8 @@
 	#define ftell(handle)						symbian_ftell(handle)
 	#define fseek(handle, offset, whence)		symbian_fseek(handle, offset, whence)
 	#define clearerr(handle)					symbian_clearerr(handle)
+    #define fflush(handle)					    symbian_fflush(handle)
+	#define ferror(handle)					    symbian_ferror(handle)
 #endif
 
 namespace Common {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.