From 32b1a000c0ef762031e333152075949fbcce2006 Mon Sep 17 00:00:00 2001
From: Amorilia <amorilia@users.sourceforge.net>
Date: Sun, 28 May 2006 19:07:47 +0000
Subject: [PATCH] More compilation fixes...

---
 xml_extract.h | 69 +++++++++++----------------------------------------
 1 file changed, 14 insertions(+), 55 deletions(-)

diff --git a/xml_extract.h b/xml_extract.h
index e79e700e..8163dc8b 100644
--- a/xml_extract.h
+++ b/xml_extract.h
@@ -1,46 +1,5 @@
-/* --------------------------------------------------------------------------
- * xml_extract.h: C++ header file for raw reading, writing, and printing
- *                NetImmerse and Gamebryo files (.nif & .kf & .kfa)
- * --------------------------------------------------------------------------
- * ***** BEGIN LICENSE BLOCK *****
- *
- * Copyright (c) 2005, NIF File Format Library and Tools
- * All rights reserved.
- * 
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *    * Redistributions in binary form must reproduce the above
- *      copyright notice, this list of conditions and the following
- *      disclaimer in the documentation and/or other materials provided
- *      with the distribution.
- *
- *    * Neither the name of the NIF File Format Library and Tools
- *      project nor the names of its contributors may be used to endorse
- *      or promote products derived from this software without specific
- *      prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENCE BLOCK *****
- * --------------------------------------------------------------------------
- */
+/* Copyright (c) 2006, NIF File Format Library and Tools
+All rights reserved.  Please see niflib.h for licence. */
 
 #ifndef _XML_EXTRACT_H_
 #define _XML_EXTRACT_H_
@@ -4697,7 +4656,7 @@ for (uint i0 = 0; i0 < binaryData_size; i0++) { \
 }; \
 
 #define NI_BLEND_BOOL_INTERPOLATOR_MEMBERS \
-byte bool; \
+byte value; \
 
 #define NI_BLEND_BOOL_INTERPOLATOR_INCLUDE "ABlendInterpolator.h" \
 
@@ -4707,23 +4666,23 @@ byte bool; \
 
 #define NI_BLEND_BOOL_INTERPOLATOR_READ \
 ABlendInterpolator::Read( in, link_stack, version ); \
-NifStream( bool, in, version ); \
+NifStream( value, in, version ); \
 
 #define NI_BLEND_BOOL_INTERPOLATOR_WRITE \
 ABlendInterpolator::Write( out, link_map, version ); \
-NifStream( bool, out, version ); \
+NifStream( value, out, version ); \
 
 #define NI_BLEND_BOOL_INTERPOLATOR_STRING \
 stringstream out; \
 out << ABlendInterpolator::asString(); \
-out << "Bool:  " << bool << endl; \
+out << "Value:  " << value << endl; \
 return out.str(); \
 
 #define NI_BLEND_BOOL_INTERPOLATOR_FIXLINKS \
 ABlendInterpolator::FixLinks( objects, link_stack, version ); \
 
 #define NI_BLEND_FLOAT_INTERPOLATOR_MEMBERS \
-float float; \
+float value; \
 
 #define NI_BLEND_FLOAT_INTERPOLATOR_INCLUDE "ABlendInterpolator.h" \
 
@@ -4733,23 +4692,23 @@ float float; \
 
 #define NI_BLEND_FLOAT_INTERPOLATOR_READ \
 ABlendInterpolator::Read( in, link_stack, version ); \
-NifStream( float, in, version ); \
+NifStream( value, in, version ); \
 
 #define NI_BLEND_FLOAT_INTERPOLATOR_WRITE \
 ABlendInterpolator::Write( out, link_map, version ); \
-NifStream( float, out, version ); \
+NifStream( value, out, version ); \
 
 #define NI_BLEND_FLOAT_INTERPOLATOR_STRING \
 stringstream out; \
 out << ABlendInterpolator::asString(); \
-out << "Float:  " << float << endl; \
+out << "Value:  " << value << endl; \
 return out.str(); \
 
 #define NI_BLEND_FLOAT_INTERPOLATOR_FIXLINKS \
 ABlendInterpolator::FixLinks( objects, link_stack, version ); \
 
 #define NI_BLEND_POINT3_INTERPOLATOR_MEMBERS \
-Vector3 point; \
+Vector3 value; \
 
 #define NI_BLEND_POINT3_INTERPOLATOR_INCLUDE "ABlendInterpolator.h" \
 
@@ -4759,16 +4718,16 @@ Vector3 point; \
 
 #define NI_BLEND_POINT3_INTERPOLATOR_READ \
 ABlendInterpolator::Read( in, link_stack, version ); \
-NifStream( point, in, version ); \
+NifStream( value, in, version ); \
 
 #define NI_BLEND_POINT3_INTERPOLATOR_WRITE \
 ABlendInterpolator::Write( out, link_map, version ); \
-NifStream( point, out, version ); \
+NifStream( value, out, version ); \
 
 #define NI_BLEND_POINT3_INTERPOLATOR_STRING \
 stringstream out; \
 out << ABlendInterpolator::asString(); \
-out << "Point:  " << point << endl; \
+out << "Value:  " << value << endl; \
 return out.str(); \
 
 #define NI_BLEND_POINT3_INTERPOLATOR_FIXLINKS \
-- 
GitLab