[Scummvm-cvs-logs] scummvm master -> cd6708b3975fa8fde858115d01f1ae288ae311e9

DrMcCoy drmccoy at drmccoy.de
Thu Aug 18 01:31:48 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cd6708b397 DREAMWEB: Fix compile on non-GNU compilers


Commit: cd6708b3975fa8fde858115d01f1ae288ae311e9
    https://github.com/scummvm/scummvm/commit/cd6708b3975fa8fde858115d01f1ae288ae311e9
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2011-08-17T16:26:25-07:00

Commit Message:
DREAMWEB: Fix compile on non-GNU compilers

mempcpy is a GNU extension and the only difference to memcpy is the
return value, which this code happily ignores. So I assume it's a
typo.

Changed paths:
    engines/dreamweb/saveload.cpp



diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 959cc25..636182d 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -301,7 +301,7 @@ void DreamGenContext::savegame() {
 			ds = data;
 			dx = kSavenames;
 			_add(dx, ax);
-			mempcpy(data.ptr(dx,17), descbuf, 17);
+			memcpy(data.ptr(dx,17), descbuf, 17);
 			saveseg();
 		} else {
 			// savenames only has room for descriptions for 7 slots






More information about the Scummvm-git-logs mailing list