From a4d32f8d1498404a0fabd5012129a45108e3a3a5 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 29 Sep 2003 18:39:56 +0000 Subject: [PATCH] compile maya5.0 on linux --- pandatool/src/maya/pre_maya_include.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pandatool/src/maya/pre_maya_include.h b/pandatool/src/maya/pre_maya_include.h index 08c60d490b..372df4149d 100644 --- a/pandatool/src/maya/pre_maya_include.h +++ b/pandatool/src/maya/pre_maya_include.h @@ -32,19 +32,18 @@ // built-in Maya stream operators, and we have to protect ourselves // from them. -// In windows, the antiquated headers define completely unrelated (and -// incompatible) classes from those declared in the new headers. On -// the other hand, in gcc the antiquated headers seem to be references -// to the new template classes, so under gcc we also have to declare -// typedefs to make this work. +// In Maya 5.0, the headers seem to provide the manifest +// REQUIRE_IOSTREAM, which forces it to use the new headers +// instead of the old headers. It also says this is for +// Linux only. #ifdef __GNUC__ #ifndef PRE_MAYA_INCLUDE_H #define PRE_MAYA_INCLUDE_H -#include -typedef ostream maya_ostream; -typedef istream maya_istream; +#define REQUIRE_IOSTREAM #endif -#endif // __GNUC__ +#else // __GNUC__ #define ostream maya_ostream #define istream maya_istream + +#endif // __GNUC__