From b4225dcf2a0d679e1745b718408c2b9de639bee3 Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Tue, 29 Dec 2009 17:30:38 +0000
Subject: [PATCH] Use stdio.h instead of cstdio etc.

svn-id: r46711
---
 compress.cpp                                  | 6 +++---
 create_sjisfnt.cpp                            | 6 +++---
 encode_dxa.cpp                                | 2 +-
 engines/agos/compress_agos.cpp                | 2 +-
 engines/agos/extract_agos.cpp                 | 6 +++---
 engines/cine/decine.cpp                       | 8 ++++----
 engines/cine/extract_cine.cpp                 | 4 ++--
 engines/gob/compress_gob.cpp                  | 2 +-
 engines/gob/degob.cpp                         | 4 ++--
 engines/gob/degob_script.cpp                  | 8 ++++----
 engines/gob/extract_gob_stk.cpp               | 4 ++--
 engines/kyra/compress_kyra.cpp                | 4 ++--
 engines/kyra/dekyra.cpp                       | 8 ++++----
 engines/kyra/dekyra_v1.cpp                    | 2 +-
 engines/kyra/extract_kyra.h                   | 2 +-
 engines/kyra/kyra_ins.cpp                     | 4 ++--
 engines/kyra/kyra_pak.cpp                     | 4 ++--
 engines/parallaction/extract_parallaction.cpp | 8 ++++----
 engines/queen/compress_queen.cpp              | 2 +-
 engines/saga/compress_saga.cpp                | 2 +-
 engines/scumm/compress_scumm_bun.cpp          | 6 +++---
 engines/scumm/compress_scumm_san.cpp          | 6 +++---
 engines/scumm/compress_scumm_sou.cpp          | 4 ++--
 engines/scumm/descumm-common.cpp              | 4 ++--
 engines/scumm/descumm-tool.cpp                | 8 ++++----
 engines/scumm/descumm.cpp                     | 6 +++---
 engines/scumm/descumm.h                       | 2 +-
 engines/scumm/descumm6.cpp                    | 6 +++---
 engines/scumm/extract_loom_tg16.cpp           | 2 +-
 engines/scumm/extract_mm_nes.cpp              | 2 +-
 engines/scumm/extract_zak_c64.cpp             | 2 +-
 engines/sword1/compress_sword1.cpp            | 6 +++---
 engines/sword2/desword2.cpp                   | 4 ++--
 engines/tinsel/compress_tinsel.cpp            | 2 +-
 engines/touche/compress_touche.cpp            | 2 +-
 engines/tucker/compress_tucker.cpp            | 4 ++--
 scummvm-tools-cli.cpp                         | 2 +-
 tool.cpp                                      | 4 ++--
 38 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/compress.cpp b/compress.cpp
index 09829c31..4c0f7096 100644
--- a/compress.cpp
+++ b/compress.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include <cassert>
-#include <cstdlib>
-#include <cstring>
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sstream>
 #include <stdio.h>
 
diff --git a/create_sjisfnt.cpp b/create_sjisfnt.cpp
index 8e288dea..cf2ba322 100644
--- a/create_sjisfnt.cpp
+++ b/create_sjisfnt.cpp
@@ -23,11 +23,11 @@
  *
  */
 
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
 #include <iconv.h>
 #include <list>
-#include <cassert>
+#include <assert.h>
 
 #include "common/endian.h"
 #include "common/file.h"
diff --git a/encode_dxa.cpp b/encode_dxa.cpp
index 37a8ddff..41f205ce 100644
--- a/encode_dxa.cpp
+++ b/encode_dxa.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include <cstdlib>
+#include <stdlib.h>
 #include <sys/stat.h>
 #include <png.h>
 
diff --git a/engines/agos/compress_agos.cpp b/engines/agos/compress_agos.cpp
index 1376f2bd..6d4790f9 100644
--- a/engines/agos/compress_agos.cpp
+++ b/engines/agos/compress_agos.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include <cstring>
+#include <string.h>
 #include <stdio.h>
 
 #include "compress_agos.h"
diff --git a/engines/agos/extract_agos.cpp b/engines/agos/extract_agos.cpp
index 6a940861..80400235 100644
--- a/engines/agos/extract_agos.cpp
+++ b/engines/agos/extract_agos.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 #include <iostream>
 
 #include "extract_agos.h"
diff --git a/engines/cine/decine.cpp b/engines/cine/decine.cpp
index 27169e0e..87b7257c 100644
--- a/engines/cine/decine.cpp
+++ b/engines/cine/decine.cpp
@@ -31,10 +31,10 @@
  * FIXME: Make this code endian safe.
  */
 
-#include <cassert>
-#include <cstdio>
-#include <cstring>
-#include <cstdlib>
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 
 #include "common/scummsys.h"
 #include "common/endian.h"
diff --git a/engines/cine/extract_cine.cpp b/engines/cine/extract_cine.cpp
index fa77586f..17f50878 100644
--- a/engines/cine/extract_cine.cpp
+++ b/engines/cine/extract_cine.cpp
@@ -33,8 +33,8 @@
  *        as the input file (e.g. "./vol.cnf" or "/games/os/vol.cnf").
  */
 
-#include <cassert>
-#include <cstring>
+#include <assert.h>
+#include <string.h>
 #include <algorithm>
 
 #include "extract_cine.h"
diff --git a/engines/gob/compress_gob.cpp b/engines/gob/compress_gob.cpp
index 3bf2c8b2..ba2a69b7 100644
--- a/engines/gob/compress_gob.cpp
+++ b/engines/gob/compress_gob.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include <cstring>
+#include <string.h>
 
 #include "compress_gob.h"
 
diff --git a/engines/gob/degob.cpp b/engines/gob/degob.cpp
index 23571b2b..4640d292 100644
--- a/engines/gob/degob.cpp
+++ b/engines/gob/degob.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <cstring>
-#include <cstdio>
+#include <string.h>
+#include <stdio.h>
 
 #include "degob_script.h"
 #include "common/file.h"
diff --git a/engines/gob/degob_script.cpp b/engines/gob/degob_script.cpp
index 6c9e6f0c..389dfd09 100644
--- a/engines/gob/degob_script.cpp
+++ b/engines/gob/degob_script.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include <cassert>
-#include <cstdarg>
-#include <cstring>
-#include <cstdio>
+#include <assert.h>
+#include <stdarg.h>
+#include <string.h>
+#include <stdio.h>
 
 #include "degob_script.h"
 #include "common/endian.h"
diff --git a/engines/gob/extract_gob_stk.cpp b/engines/gob/extract_gob_stk.cpp
index 0b4a1fd5..f2b4a993 100644
--- a/engines/gob/extract_gob_stk.cpp
+++ b/engines/gob/extract_gob_stk.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <cstring>
-#include <cstdio>
+#include <string.h>
+#include <stdio.h>
 
 #include "extract_gob_stk.h"
 #include "common/endian.h"
diff --git a/engines/kyra/compress_kyra.cpp b/engines/kyra/compress_kyra.cpp
index 21317a36..6fc5a2e1 100644
--- a/engines/kyra/compress_kyra.cpp
+++ b/engines/kyra/compress_kyra.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <cassert>
-#include <cstdlib>
+#include <assert.h>
+#include <stdlib.h>
 #include <stdio.h>
 
 #include "compress_kyra.h"
diff --git a/engines/kyra/dekyra.cpp b/engines/kyra/dekyra.cpp
index ef76ea1c..a7cf4f5c 100644
--- a/engines/kyra/dekyra.cpp
+++ b/engines/kyra/dekyra.cpp
@@ -21,10 +21,10 @@
  *
  */
 
-#include <cassert>
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 
 #include "dekyra.h"
 #include "common/endian.h"
diff --git a/engines/kyra/dekyra_v1.cpp b/engines/kyra/dekyra_v1.cpp
index f75634a4..501e600f 100644
--- a/engines/kyra/dekyra_v1.cpp
+++ b/engines/kyra/dekyra_v1.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include <cstdio>
+#include <stdio.h>
 
 #include "dekyra.h"
 #include "common/endian.h"
diff --git a/engines/kyra/extract_kyra.h b/engines/kyra/extract_kyra.h
index eb1ff953..b00c7db5 100644
--- a/engines/kyra/extract_kyra.h
+++ b/engines/kyra/extract_kyra.h
@@ -23,7 +23,7 @@
 #ifndef EXTRACT_KYRA_H
 #define EXTRACT_KYRA_H
 
-#include <cstring>
+#include <string.h>
 
 #include "tool.h"
 
diff --git a/engines/kyra/kyra_ins.cpp b/engines/kyra/kyra_ins.cpp
index 1e1381e5..54a71ea8 100644
--- a/engines/kyra/kyra_ins.cpp
+++ b/engines/kyra/kyra_ins.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <cassert>
-#include <cstdio>
+#include <assert.h>
+#include <stdio.h>
 
 #include "kyra_ins.h"
 
diff --git a/engines/kyra/kyra_pak.cpp b/engines/kyra/kyra_pak.cpp
index f2e82657..7ffc5989 100644
--- a/engines/kyra/kyra_pak.cpp
+++ b/engines/kyra/kyra_pak.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <cassert>
-#include <cstdio>
+#include <assert.h>
+#include <stdio.h>
 
 #include "kyra_pak.h"
 
diff --git a/engines/parallaction/extract_parallaction.cpp b/engines/parallaction/extract_parallaction.cpp
index 44efb7d4..b0418cbe 100644
--- a/engines/parallaction/extract_parallaction.cpp
+++ b/engines/parallaction/extract_parallaction.cpp
@@ -20,10 +20,10 @@
  *
  */
 
-#include <cassert>
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 
 #include "extract_parallaction.h"
 
diff --git a/engines/queen/compress_queen.cpp b/engines/queen/compress_queen.cpp
index 6b7a3a59..4b46ce15 100644
--- a/engines/queen/compress_queen.cpp
+++ b/engines/queen/compress_queen.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include <cstring>
+#include <string.h>
 
 #include "compress.h"
 
diff --git a/engines/saga/compress_saga.cpp b/engines/saga/compress_saga.cpp
index 5f27ce3a..0d923cce 100644
--- a/engines/saga/compress_saga.cpp
+++ b/engines/saga/compress_saga.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include <cstdlib>
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
diff --git a/engines/scumm/compress_scumm_bun.cpp b/engines/scumm/compress_scumm_bun.cpp
index a468b3da..7986e193 100644
--- a/engines/scumm/compress_scumm_bun.cpp
+++ b/engines/scumm/compress_scumm_bun.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include <cassert>
-#include <cstdlib>
-#include <cstring>
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 #include <stdio.h>
 
 #include "compress_scumm_bun.h"
diff --git a/engines/scumm/compress_scumm_san.cpp b/engines/scumm/compress_scumm_san.cpp
index 35620fa1..d6a0cd1c 100644
--- a/engines/scumm/compress_scumm_san.cpp
+++ b/engines/scumm/compress_scumm_san.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include <cassert>
-#include <cstdlib>
-#include <cstring>
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 #include <zlib.h>
 #include <stdio.h>
 
diff --git a/engines/scumm/compress_scumm_sou.cpp b/engines/scumm/compress_scumm_sou.cpp
index 2e76f5f6..21beadd2 100644
--- a/engines/scumm/compress_scumm_sou.cpp
+++ b/engines/scumm/compress_scumm_sou.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <cassert>
-#include <cstring>
+#include <assert.h>
+#include <string.h>
 
 #include "compress_scumm_sou.h"
 
diff --git a/engines/scumm/descumm-common.cpp b/engines/scumm/descumm-common.cpp
index 3918c6d9..3e38a2aa 100644
--- a/engines/scumm/descumm-common.cpp
+++ b/engines/scumm/descumm-common.cpp
@@ -21,8 +21,8 @@
  *
  */
 
-#include <cstring>
-#include <cstdio>
+#include <string.h>
+#include <stdio.h>
 
 #include "descumm.h"
 
diff --git a/engines/scumm/descumm-tool.cpp b/engines/scumm/descumm-tool.cpp
index 688eceb0..411dc491 100644
--- a/engines/scumm/descumm-tool.cpp
+++ b/engines/scumm/descumm-tool.cpp
@@ -21,10 +21,10 @@
  *
  */
 
-#include <cctype>
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 
 #include "descumm.h"
 
diff --git a/engines/scumm/descumm.cpp b/engines/scumm/descumm.cpp
index 0ddc7bf8..860875e1 100644
--- a/engines/scumm/descumm.cpp
+++ b/engines/scumm/descumm.cpp
@@ -21,9 +21,9 @@
  *
  */
 
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 
 #include "descumm.h"
 
diff --git a/engines/scumm/descumm.h b/engines/scumm/descumm.h
index 007d4764..8b4b2c19 100644
--- a/engines/scumm/descumm.h
+++ b/engines/scumm/descumm.h
@@ -24,7 +24,7 @@
 #ifndef DESCUMM_H
 #define DESCUMM_H
 
-#include <cassert>
+#include <assert.h>
 
 #include "common/scummsys.h"
 
diff --git a/engines/scumm/descumm6.cpp b/engines/scumm/descumm6.cpp
index 9cf2e048..538e3733 100644
--- a/engines/scumm/descumm6.cpp
+++ b/engines/scumm/descumm6.cpp
@@ -21,9 +21,9 @@
  *
  */
 
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 
 #include "descumm.h"
 
diff --git a/engines/scumm/extract_loom_tg16.cpp b/engines/scumm/extract_loom_tg16.cpp
index 23533b1c..061d9419 100644
--- a/engines/scumm/extract_loom_tg16.cpp
+++ b/engines/scumm/extract_loom_tg16.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include <cstring>
+#include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
 
diff --git a/engines/scumm/extract_mm_nes.cpp b/engines/scumm/extract_mm_nes.cpp
index a7598756..089f968d 100644
--- a/engines/scumm/extract_mm_nes.cpp
+++ b/engines/scumm/extract_mm_nes.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include <cstring>
+#include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include "extract_mm_nes.h"
diff --git a/engines/scumm/extract_zak_c64.cpp b/engines/scumm/extract_zak_c64.cpp
index 5a294c98..288b7e61 100644
--- a/engines/scumm/extract_zak_c64.cpp
+++ b/engines/scumm/extract_zak_c64.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include <cstdio>
+#include <stdio.h>
 #include <stdarg.h>
 #include "extract_zak_c64.h"
 
diff --git a/engines/sword1/compress_sword1.cpp b/engines/sword1/compress_sword1.cpp
index 5590a589..dee5c8f6 100644
--- a/engines/sword1/compress_sword1.cpp
+++ b/engines/sword1/compress_sword1.cpp
@@ -20,9 +20,9 @@
  *
  */
 
-#include <cassert>
-#include <cstdlib>
-#include <cstring>
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 #include <stdio.h>
 
 #include "compress_sword1.h"
diff --git a/engines/sword2/desword2.cpp b/engines/sword2/desword2.cpp
index b4639ed7..83b543d4 100644
--- a/engines/sword2/desword2.cpp
+++ b/engines/sword2/desword2.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <cstdlib>
-#include <cstdio>
+#include <stdlib.h>
+#include <stdio.h>
 
 #include "common/file.h"
 
diff --git a/engines/tinsel/compress_tinsel.cpp b/engines/tinsel/compress_tinsel.cpp
index 876a8ed2..03d4d0f6 100644
--- a/engines/tinsel/compress_tinsel.cpp
+++ b/engines/tinsel/compress_tinsel.cpp
@@ -22,7 +22,7 @@
 
 // By Jimi (m [underline] kiewitz [AT] users.sourceforge.net)
 
-#include <cstdlib>
+#include <stdlib.h>
 
 #include "compress.h"
 #include "common/endian.h"
diff --git a/engines/touche/compress_touche.cpp b/engines/touche/compress_touche.cpp
index 69d136c4..daefbd4e 100644
--- a/engines/touche/compress_touche.cpp
+++ b/engines/touche/compress_touche.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include <cstring>
+#include <string.h>
 #include <stdio.h>
 
 #include "compress.h"
diff --git a/engines/tucker/compress_tucker.cpp b/engines/tucker/compress_tucker.cpp
index 0a681e6a..524a8890 100644
--- a/engines/tucker/compress_tucker.cpp
+++ b/engines/tucker/compress_tucker.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <cassert>
-#include <cstring>
+#include <assert.h>
+#include <string.h>
 #include <stdio.h>
 
 #include "compress.h"
diff --git a/scummvm-tools-cli.cpp b/scummvm-tools-cli.cpp
index de86e2a8..05f4ba10 100644
--- a/scummvm-tools-cli.cpp
+++ b/scummvm-tools-cli.cpp
@@ -22,7 +22,7 @@
 
 #include <iostream>
 #include <algorithm>
-#include <cassert>
+#include <assert.h>
 
 #include "scummvm-tools-cli.h"
 
diff --git a/tool.cpp b/tool.cpp
index f6a8c3af..3f952e30 100644
--- a/tool.cpp
+++ b/tool.cpp
@@ -21,8 +21,8 @@
  */
 
 #include <stdarg.h>
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
 #include <iostream>
 #include <sstream>