[Scummvm-cvs-logs] scummvm master -> 0a2fb9a465fe371daabf2a475fc20c5a870887c6
fingolfin
max at quendi.de
Mon Jun 6 17:07:12 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
0a2fb9a465 COMMON: Make more symbols forbidden
Commit: 0a2fb9a465fe371daabf2a475fc20c5a870887c6
https://github.com/scummvm/scummvm/commit/0a2fb9a465fe371daabf2a475fc20c5a870887c6
Author: Max Horn (max at quendi.de)
Date: 2011-06-06T08:05:35-07:00
Commit Message:
COMMON: Make more symbols forbidden
Changed paths:
common/forbidden.h
common/system.cpp
common/xmlparser.cpp
engines/sword25/util/lua/ldblib.cpp
diff --git a/common/forbidden.h b/common/forbidden.h
index c551110..995442d 100644
--- a/common/forbidden.h
+++ b/common/forbidden.h
@@ -79,6 +79,21 @@
#define FILE FORBIDDEN_SYMBOL_REPLACEMENT
#endif
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_stdin
+#undef stdin
+#define stdin FORBIDDEN_SYMBOL_REPLACEMENT
+#endif
+
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_stdout
+#undef stdout
+#define stdout FORBIDDEN_SYMBOL_REPLACEMENT
+#endif
+
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_stderr
+#undef stderr
+#define stderr FORBIDDEN_SYMBOL_REPLACEMENT
+#endif
+
#ifndef FORBIDDEN_SYMBOL_EXCEPTION_fopen
#undef fopen
#define fopen(a,b) FORBIDDEN_SYMBOL_REPLACEMENT
@@ -124,22 +139,41 @@
#define fputc(a,b) FORBIDDEN_SYMBOL_REPLACEMENT
#endif
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_fgets
+#undef fgets
+#define fgets(a,b,c) FORBIDDEN_SYMBOL_REPLACEMENT
+#endif
+
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_fputs
+#undef fputs
+#define fputs(a,b) FORBIDDEN_SYMBOL_REPLACEMENT
+#endif
#ifndef FORBIDDEN_SYMBOL_EXCEPTION_getc
#undef getc
#define getc(a) FORBIDDEN_SYMBOL_REPLACEMENT
#endif
-#ifndef FORBIDDEN_SYMBOL_EXCEPTION_getchar
-#undef getchar
-#define getchar() FORBIDDEN_SYMBOL_REPLACEMENT
-#endif
-
#ifndef FORBIDDEN_SYMBOL_EXCEPTION_putc
#undef putc
#define putc(a,b) FORBIDDEN_SYMBOL_REPLACEMENT
#endif
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_gets
+#undef gets
+#define gets(a) FORBIDDEN_SYMBOL_REPLACEMENT
+#endif
+
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_puts
+#undef puts
+#define puts(a) FORBIDDEN_SYMBOL_REPLACEMENT
+#endif
+
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_getchar
+#undef getchar
+#define getchar() FORBIDDEN_SYMBOL_REPLACEMENT
+#endif
+
#ifndef FORBIDDEN_SYMBOL_EXCEPTION_putchar
#undef putchar
#define putchar(a) FORBIDDEN_SYMBOL_REPLACEMENT
diff --git a/common/system.cpp b/common/system.cpp
index 2a0dfd8..cd6ee46 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -24,6 +24,8 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
#define FORBIDDEN_SYMBOL_EXCEPTION_fputs
#define FORBIDDEN_SYMBOL_EXCEPTION_fflush
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdout
+#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
#include "common/system.h"
#include "common/events.h"
diff --git a/common/xmlparser.cpp b/common/xmlparser.cpp
index ea36f0b..5217c4e 100644
--- a/common/xmlparser.cpp
+++ b/common/xmlparser.cpp
@@ -22,6 +22,7 @@
// FIXME: Avoid using fprintf
#define FORBIDDEN_SYMBOL_EXCEPTION_fprintf
+#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
#include "common/xmlparser.h"
diff --git a/engines/sword25/util/lua/ldblib.cpp b/engines/sword25/util/lua/ldblib.cpp
index b2e249e..4d0333b 100644
--- a/engines/sword25/util/lua/ldblib.cpp
+++ b/engines/sword25/util/lua/ldblib.cpp
@@ -4,6 +4,10 @@
** See Copyright Notice in lua.h
*/
+#define FORBIDDEN_SYMBOL_EXCEPTION_stdin
+#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
+#define FORBIDDEN_SYMBOL_EXCEPTION_fputs
+#define FORBIDDEN_SYMBOL_EXCEPTION_fgets
#include <stdio.h>
#include <stdlib.h>
More information about the Scummvm-git-logs
mailing list