[ scummvm-Patches-1823349 ] TOOLS: Fixes to let them build on AmigaOS4

[SourceForge.net]

Patches item #1823349, was opened at 2007-10-31 09:43
Message generated for change (Tracker Item Submitted) made by Item Submitter
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=418822&aid=1823349&group_id=37116

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Raziel (vampir_raziel)
Assigned to: Nobody/Anonymous (nobody)
Summary: TOOLS: Fixes to let them build on AmigaOS4

Initial Comment:
Mostly typedef clashes and one wrong size(?)

Index: scummvm_tools/compress_scumm_bun.cpp
===================================================================
--- scummvm_tools/compress_scumm_bun.cpp	(revision 29335)
+++ scummvm_tools/compress_scumm_bun.cpp	(working copy)
@@ -763,7 +763,7 @@
 
 typedef struct { int offset, size, codec; } CompTable;
 
-byte *decompressBundleSound(int index, FILE *input, int32 &finalSize) {
+byte *decompressBundleSound(int index, FILE *input, int &finalSize) {
 	byte compOutput[0x2000];
 	int i;
 
Index: scummvm_tools/extract_mm_nes.c
===================================================================
--- scummvm_tools/extract_mm_nes.c	(revision 29335)
+++ scummvm_tools/extract_mm_nes.c	(working copy)
@@ -23,7 +23,12 @@
 #include "util.h"
 #include <stdarg.h>
 
+#ifdef __amigaos4__ 
+#include <exec/types.h> 
+#include <stdlib.h>
+#else
 typedef int BOOL;
+#endif
 #define TRUE 1
 #define FALSE 0
 
Index: scummvm_tools/util.h
===================================================================
--- scummvm_tools/util.h	(revision 29335)
+++ scummvm_tools/util.h	(working copy)
@@ -47,10 +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
 
 #if !defined(__cplusplus)
 typedef uint8 bool;
Index: scummvm_tools/extract_zak_c64.c
===================================================================
--- scummvm_tools/extract_zak_c64.c	(revision 29335)
+++ scummvm_tools/extract_zak_c64.c	(working copy)
@@ -23,7 +23,12 @@
 #include "util.h"
 #include <stdarg.h>
 
+#ifdef __amigaos4__ 
+#include <exec/types.h> 
+#include <stdlib.h>
+#else
 typedef int BOOL;
+#endif
 #define TRUE 1
 #define FALSE 0
 
Index: scummvm_tools/extract_loom_tg16.c
===================================================================
--- scummvm_tools/extract_loom_tg16.c	(revision 29335)
+++ scummvm_tools/extract_loom_tg16.c	(working copy)
@@ -26,7 +26,12 @@
 #include <string.h>
 #include "util.h"
 
+#ifdef __amigaos4__ 
+#include <exec/types.h> 
+#include <stdlib.h>
+#else
 typedef int BOOL;
+#endif
 #define TRUE 1
 #define FALSE 0
 
Index: scummvm_tools/extract_mm_c64.c
===================================================================
--- scummvm_tools/extract_mm_c64.c	(revision 29335)
+++ scummvm_tools/extract_mm_c64.c	(working copy)
@@ -23,7 +23,12 @@
 #include "util.h"
 #include <stdarg.h>
 
+#ifdef __amigaos4__ 
+#include <exec/types.h> 
+#include <stdlib.h>
+#else
 typedef int BOOL;
+#endif
 #define TRUE 1
 #define FALSE 0
 
Index: scummvm_tools/extract_mm_apple.c
===================================================================
--- scummvm_tools/extract_mm_apple.c	(revision 29335)
+++ scummvm_tools/extract_mm_apple.c	(working copy)
@@ -23,7 +23,12 @@
 #include "util.h"
 #include <stdarg.h>
 
+#ifdef __amigaos4__ 
+#include <exec/types.h> 
+#include <stdlib.h>
+#else
 typedef int BOOL;
+#endif
 #define TRUE 1
 #define FALSE 0
 

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=418822&aid=1823349&group_id=37116