[Scummvm-cvs-logs] SF.net SVN: scummvm:[43700] scummvm/trunk/sound/shorten.h

[lordhoto at users.sourceforge.net]

Revision: 43700
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43700&view=rev
Author:   lordhoto
Date:     2009-08-24 16:07:46 +0000 (Mon, 24 Aug 2009)

Log Message:
-----------
- Change shorten.h guard to match the sjis.h guard.
- Also enable shorten code when the build includes support for dynamic engine plugins.

Modified Paths:
--------------
    scummvm/trunk/sound/shorten.h

Modified: scummvm/trunk/sound/shorten.h
===================================================================
--- scummvm/trunk/sound/shorten.h	2009-08-24 14:00:29 UTC (rev 43699)
+++ scummvm/trunk/sound/shorten.h	2009-08-24 16:07:46 UTC (rev 43700)
@@ -23,14 +23,16 @@
  *
  */
 
-// The code in this file is currently only used in SAGA2 (in the
-// SAGA engine), so if that engine isn't enabled, we will skip
-// compiling it. If you plan to use this code in another engine,
-// you will have to add the proper define check here.
-// Also please add the define check at the comment after the
-// matching #endif further down this file.
-#if defined(ENABLE_SAGA2)
+// The code in this file is currently only used in SAGA2.
+// So when it is disabled, we will skip compiling it.
+// We also enable this code for ScummVM builds including support
+// for dynamic engine plugins.
+// If you plan to use this code in another engine, you will have
+// to add the proper define check here.
+#if !(defined(ENABLE_SAGA2) || defined(DYNAMIC_MODULES))
 
+#else
+
 #ifndef SOUND_SHORTEN_H
 #define SOUND_SHORTEN_H
 
@@ -48,7 +50,7 @@
  * start of the audio data, and size, rate and flags contain information
  * necessary for playback.
  */
-extern byte *loadShortenFromStream(Common::ReadStream &stream, int &size, int &rate, byte &flags);
+byte *loadShortenFromStream(Common::ReadStream &stream, int &size, int &rate, byte &flags);
 
 /**
  * Try to load a Shorten file from the given stream and create an AudioStream
@@ -62,6 +64,5 @@
 
 #endif
 
-#endif // defined(ENABLE_SAGA2)
+#endif // engine and dynamic plugins guard
 
-


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