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

[drmccoy at users.sourceforge.net]

Revision: 34331
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34331&view=rev
Author:   drmccoy
Date:     2008-09-04 18:47:03 +0000 (Thu, 04 Sep 2008)

Log Message:
-----------
Fixing compilation for Raziel^

Modified Paths:
--------------
    tools/trunk/compress_scumm_bun.cpp
    tools/trunk/util.h

Modified: tools/trunk/compress_scumm_bun.cpp
===================================================================
--- tools/trunk/compress_scumm_bun.cpp	2008-09-04 17:39:48 UTC (rev 34330)
+++ tools/trunk/compress_scumm_bun.cpp	2008-09-04 18:47:03 UTC (rev 34331)
@@ -1227,7 +1227,8 @@
 	for (i = 0; i < numFiles; i++) {
 		if (strcmp(bundleTable[i].filename, "PRELOAD.") == 0)
 			continue;
-		int offsetData = 0, bits = 0, freq = 0, channels = 0, size = 0;
+		int offsetData = 0, bits = 0, freq = 0, channels = 0;
+		int32 size = 0;
 		byte *compFinal = decompressBundleSound(i, input, size);
 		writeToRMAPFile(compFinal, output, bundleTable[i].filename, offsetData, bits, freq, channels);
 		writeRegions(compFinal + offsetData, bits, freq, channels, outputDir, bundleTable[i].filename, output);

Modified: tools/trunk/util.h
===================================================================
--- tools/trunk/util.h	2008-09-04 17:39:48 UTC (rev 34330)
+++ tools/trunk/util.h	2008-09-04 18:47:03 UTC (rev 34331)
@@ -47,12 +47,16 @@
 typedef unsigned char byte;
 typedef unsigned char uint8;
 typedef unsigned short uint16;
-typedef unsigned int uint32;
 typedef signed char int8;
 typedef signed short int16;
+#ifdef __amigaos4__ 
+#include <exec/types.h> 
+#include <stdlib.h>
+#else
+typedef unsigned int uint32;
 typedef signed int int32;
+#endif
 
-
 /*
  * Various utility macros
  */


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