[Scummvm-cvs-logs] SF.net SVN: scummvm:[55011] scummvm/trunk/backends/plugins/elf

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Wed Dec 22 16:09:42 CET 2010


Revision: 55011
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55011&view=rev
Author:   lordhoto
Date:     2010-12-22 15:09:42 +0000 (Wed, 22 Dec 2010)

Log Message:
-----------
PLUGINS: Only enable ELFMemoryManager when dynamic plugins and the ELF loader is enabled.

This should fix compilation on desktop systems, where for example memalign
is not present.

Modified Paths:
--------------
    scummvm/trunk/backends/plugins/elf/memory-manager.cpp
    scummvm/trunk/backends/plugins/elf/memory-manager.h

Modified: scummvm/trunk/backends/plugins/elf/memory-manager.cpp
===================================================================
--- scummvm/trunk/backends/plugins/elf/memory-manager.cpp	2010-12-22 15:07:14 UTC (rev 55010)
+++ scummvm/trunk/backends/plugins/elf/memory-manager.cpp	2010-12-22 15:09:42 UTC (rev 55011)
@@ -24,8 +24,11 @@
  */
 
 #include "common/scummsys.h" 
+
+#if defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER)
+
+#include "backends/plugins/elf/memory-manager.h"
 #include "common/util.h"
-#include "backends/plugins/elf/memory-manager.h"
  
 DECLARE_SINGLETON(ELFMemoryManager); 
 
@@ -166,3 +169,6 @@
 		}
 	}	
 }
+
+#endif /* defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER) */
+

Modified: scummvm/trunk/backends/plugins/elf/memory-manager.h
===================================================================
--- scummvm/trunk/backends/plugins/elf/memory-manager.h	2010-12-22 15:07:14 UTC (rev 55010)
+++ scummvm/trunk/backends/plugins/elf/memory-manager.h	2010-12-22 15:09:42 UTC (rev 55011)
@@ -26,6 +26,10 @@
 #ifndef ELF_MEMORY_MANAGER_H
 #define ELF_MEMORY_MANAGER_H
 
+#include "common/scummsys.h"
+
+#if defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER)
+
 #include "common/singleton.h"
 #include "common/list.h"
 #include "common/mutex.h"
@@ -80,4 +84,6 @@
 	uint32 _bytesAllocated;
 };
  
+#endif /* defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER) */
+
 #endif /* ELF_MEMORY_MANAGER_H */


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




More information about the Scummvm-git-logs mailing list