diff --git a/pandatool/src/maya/post_maya_include.h b/pandatool/src/maya/post_maya_include.h index d31fa23a69..f852589a8d 100644 --- a/pandatool/src/maya/post_maya_include.h +++ b/pandatool/src/maya/post_maya_include.h @@ -1,24 +1,24 @@ -// Filename: post_maya_include.h -// Created by: drose (11Apr02) -// -//////////////////////////////////////////////////////////////////// -// -// PANDA 3D SOFTWARE -// Copyright (c) 2001, Disney Enterprises, Inc. All rights reserved -// -// All use of this software is subject to the terms of the Panda 3d -// Software license. You should have received a copy of this license -// along with this source code; you will also find a current copy of -// the license at http://www.panda3d.org/license.txt . -// -// To contact the maintainers of this program write to -// panda3d@yahoogroups.com . -// -//////////////////////////////////////////////////////////////////// - -// This header file works in conjunction with pre_maya_include.h; it -// cleans up some of the definitions that it left open. - -// Remove the symbols defined from pre_maya_include.h. -#undef ostream -#undef istream +// Filename: post_maya_include.h +// Created by: drose (11Apr02) +// +//////////////////////////////////////////////////////////////////// +// +// PANDA 3D SOFTWARE +// Copyright (c) 2001, Disney Enterprises, Inc. All rights reserved +// +// All use of this software is subject to the terms of the Panda 3d +// Software license. You should have received a copy of this license +// along with this source code; you will also find a current copy of +// the license at http://www.panda3d.org/license.txt . +// +// To contact the maintainers of this program write to +// panda3d@yahoogroups.com . +// +//////////////////////////////////////////////////////////////////// + +// This header file works in conjunction with pre_maya_include.h; it +// cleans up some of the definitions that it left open. + +// Remove the symbols defined from pre_maya_include.h. +#undef ostream +#undef istream diff --git a/pandatool/src/maya/pre_maya_include.h b/pandatool/src/maya/pre_maya_include.h index bcc5d76abb..84a0811a0a 100644 --- a/pandatool/src/maya/pre_maya_include.h +++ b/pandatool/src/maya/pre_maya_include.h @@ -1,35 +1,35 @@ -// Filename: pre_maya_include.h -// Created by: drose (11Apr02) -// -//////////////////////////////////////////////////////////////////// -// -// PANDA 3D SOFTWARE -// Copyright (c) 2001, Disney Enterprises, Inc. All rights reserved -// -// All use of this software is subject to the terms of the Panda 3d -// Software license. You should have received a copy of this license -// along with this source code; you will also find a current copy of -// the license at http://www.panda3d.org/license.txt . -// -// To contact the maintainers of this program write to -// panda3d@yahoogroups.com . -// -//////////////////////////////////////////////////////////////////// - -// This header file defines a few things that are necessary to define -// before including any Maya headers, just to work around some of -// Maya's assumptions about the compiler. It must not try to protect -// itself from multiple inclusion with #ifdef .. #endif, since it must -// be used each time it is included. - -// Maya will try to typedef bool unless this symbol is defined. -#ifndef _BOOL -#define _BOOL 1 -#endif - -// Maya tries to make a forward declaration for class ostream, but -// this is not necessarily a class! Curses. We can't use any of the -// built-in Maya stream operators, and we have to protect ourselves -// from them. -#define ostream maya_ostream -#define istream maya_istream +// Filename: pre_maya_include.h +// Created by: drose (11Apr02) +// +//////////////////////////////////////////////////////////////////// +// +// PANDA 3D SOFTWARE +// Copyright (c) 2001, Disney Enterprises, Inc. All rights reserved +// +// All use of this software is subject to the terms of the Panda 3d +// Software license. You should have received a copy of this license +// along with this source code; you will also find a current copy of +// the license at http://www.panda3d.org/license.txt . +// +// To contact the maintainers of this program write to +// panda3d@yahoogroups.com . +// +//////////////////////////////////////////////////////////////////// + +// This header file defines a few things that are necessary to define +// before including any Maya headers, just to work around some of +// Maya's assumptions about the compiler. It must not try to protect +// itself from multiple inclusion with #ifdef .. #endif, since it must +// be used each time it is included. + +// Maya will try to typedef bool unless this symbol is defined. +#ifndef _BOOL +#define _BOOL 1 +#endif + +// Maya tries to make a forward declaration for class ostream, but +// this is not necessarily a class! Curses. We can't use any of the +// built-in Maya stream operators, and we have to protect ourselves +// from them. +#define ostream maya_ostream +#define istream maya_istream