# 
# patch "ChangeLog"
#  from [e6069e74f7283fc93e85e79ef1fad177e6b0581e]
#    to [ed9d285cad976debcb863b0523c3aa57a05a21ea]
# 
# patch "lua/ldump.c"
#  from [297943ff81b48eae3c97b0e8ea212590d7dade80]
#    to [a770bff2c74d1aafcbc5c67b88b10ad7541d3a43]
# 
# patch "lua/lundump.c"
#  from [58a584e2abb454009b2d4858f2cb0f40c280a13d]
#    to [0b6646b71d4e2ee76f7cc417ce54f45b75f98faf]
# 
# patch "lua/lundump.h"
#  from [cba1c173d6050524020dcac367c85b27af374f0a]
#    to [f41e2bc1056cc0b1d7bbf69d9e7682a396706658]
# 
===============================================
--- ChangeLog	e6069e74f7283fc93e85e79ef1fad177e6b0581e
+++ ChangeLog	ed9d285cad976debcb863b0523c3aa57a05a21ea
@@ -1,3 +1,9 @@
+2005-07-23  Matthew Gregan  <address@hidden>
+
+	* lua/lundump.[ch], lua/ldump.c: Rename VERSION and VERSION0 to
+	LUA_DUMP_VERSION and LUA_DUMP_VERSION0 to avoid clashes with
+	VERSION from config.h.
+
 2005-07-22  Nathaniel Smith  <address@hidden>
 
 	* monotone.texi (Committing Work): Remove discussion of manifests.
===============================================
--- lua/ldump.c	297943ff81b48eae3c97b0e8ea212590d7dade80
+++ lua/ldump.c	a770bff2c74d1aafcbc5c67b88b10ad7541d3a43
@@ -142,7 +142,7 @@
 static void DumpHeader(DumpState* D)
 {
  DumpLiteral(LUA_SIGNATURE,D);
- DumpByte(VERSION,D);
+ DumpByte(LUA_DUMP_VERSION,D);
  DumpByte(luaU_endianness(),D);
  DumpByte(sizeof(int),D);
  DumpByte(sizeof(size_t),D);
===============================================
--- lua/lundump.c	58a584e2abb454009b2d4858f2cb0f40c280a13d
+++ lua/lundump.c	0b6646b71d4e2ee76f7cc417ce54f45b75f98faf
@@ -229,14 +229,14 @@
  lua_Number x,tx=TEST_NUMBER;
  LoadSignature(S);
  version=LoadByte(S);
- if (version>VERSION)
+ if (version>LUA_DUMP_VERSION)
   luaG_runerror(S->L,"%s too new: "
 	"read version %d.%d; expected at most %d.%d",
-	S->name,V(version),V(VERSION));
- if (version<VERSION0)				/* check last major change */
+	S->name,V(version),V(LUA_DUMP_VERSION));
+ if (version<LUA_DUMP_VERSION0)				/* check last major change */
   luaG_runerror(S->L,"%s too old: "
 	"read version %d.%d; expected at least %d.%d",
-	S->name,V(version),V(VERSION0));
+	S->name,V(version),V(LUA_DUMP_VERSION0));
  S->swap=(luaU_endianness()!=LoadByte(S));	/* need to swap bytes? */
  TESTSIZE(sizeof(int),"int");
  TESTSIZE(sizeof(size_t), "size_t");
===============================================
--- lua/lundump.h	cba1c173d6050524020dcac367c85b27af374f0a
+++ lua/lundump.h	f41e2bc1056cc0b1d7bbf69d9e7682a396706658
@@ -24,8 +24,8 @@
 
 /* definitions for headers of binary files */
 #define	LUA_SIGNATURE	"\033Lua"	/* binary files start with "<esc>Lua" */
-#define	VERSION		0x50		/* last format change was in 5.0 */
-#define	VERSION0	0x50		/* last major  change was in 5.0 */
+#define	LUA_DUMP_VERSION   0x50	/* last format change was in 5.0 */
+#define	LUA_DUMP_VERSION0  0x50 /* last major  change was in 5.0 */
 
 /* a multiple of PI for testing native format */
 /* multiplying by 1E7 gives non-trivial integer values */