Index: trunk/i386/libsaio/xml.c
===================================================================
--- trunk/i386/libsaio/xml.c	(revision 2708)
+++ trunk/i386/libsaio/xml.c	(revision 2709)
@@ -276,10 +276,10 @@
 #define _e(str,c) {str,sizeof(str)-1,c}
 const XMLEntity ents[] = {
 	_e("quot;",'"'),  // double quotation mark
-	_e("apos;",'\''), // ampersand
-	_e("lt;",  '<'),  // apostrophe (apostrophe-quote)
-	_e("gt;",  '>'),  // less-than sign
-	_e("amp;", '&')   // greater-than sign
+	_e("apos;",'\''), // apostrophe (apostrophe-quote)
+	_e("lt;",  '<'),  // less-than sign
+	_e("gt;",  '>'),  // greater-than sign
+	_e("amp;", '&')   // ampersand
 };
 
 /* Function for basic XML character entities parsing */
@@ -396,8 +396,8 @@
 	if (!strncmp(tagName, kXMLTagPList, 6))
 	{
 		length = 0;
-        // just a header; nothing to parse
-        // return-via-reference tag should be left alone
+		// just a header; nothing to parse
+		// return-via-reference tag should be left alone
 	}
 	/***** dict ****/
 	else if (!strncmp(tagName, kXMLTagDict, sizeof(kXMLTagDict)))
@@ -822,7 +822,7 @@
 	{
 		val += 2;
 		while(*val)
-		{			
+		{
 			if ((*val >= '0' && *val <= '9'))	// 0 - 9
 			{
 				integer = (integer * 16) + (*val++ - '0');
Index: trunk/i386/libsaio/sys.c
===================================================================
--- trunk/i386/libsaio/sys.c	(revision 2708)
+++ trunk/i386/libsaio/sys.c	(revision 2709)
@@ -82,8 +82,8 @@
 	#define DBG(x...)	msglog(x)
 #endif
 
-#ifndef DEBUG_FEATURE_LAST_BOOT
-	#define DEBUG_FEATURE_LAST_BOOT 0 // AllocateKernelMemory error with feature from 2562
+#ifndef FEATURE_LAST_BOOT
+	#define FEATURE_LAST_BOOT 0 // AllocateKernelMemory error with feature from 2562
 #endif
 
 extern int multiboot_partition;
@@ -969,7 +969,7 @@
 	BVRef bvr1		= NULL;
 	BVRef bvr2		= NULL;
 
-#if DEBUG_FEATURE_LAST_BOOT
+#if FEATURE_LAST_BOOT
 	char dirSpec[]		= "hd(%d,%d)/";
 	char fileSpec[]		= "Volumes";
 	char *label;
@@ -994,7 +994,7 @@
 
 			if ( (bvr->part_no == multiboot_partition) && (bvr->biosdev == gBIOSDev) )
 			{
-#if DEBUG_FEATURE_LAST_BOOT
+#if FEATURE_LAST_BOOT
 				label = bvr->label[0] ? bvr->label : (bvr->altlabel[0] ? bvr->altlabel : (bvr->name[0] ? bvr->name : "Untitled"));
 				DBG("Multiboot partition set: hd(%d,%d) '%s'\n", BIOS_DEV_UNIT(bvr), bvr->part_no, label);
 #endif
@@ -1028,7 +1028,7 @@
 			if (matchVolumeToString(bvr, val, false))
 			{
 				free(val);
-#if DEBUG_FEATURE_LAST_BOOT
+#if FEATURE_LAST_BOOT
 				label = bvr->label[0] ? bvr->label : (bvr->altlabel[0] ? bvr->altlabel : (bvr->name[0] ? bvr->name : "Untitled"));
 				DBG("User default partition set: hd(%d,%d) '%s'\n", BIOS_DEV_UNIT(bvr), bvr->part_no, label);
 #endif
@@ -1038,7 +1038,7 @@
 		free(val);
 	}
 
-#if DEBUG_FEATURE_LAST_BOOT   // the above code cause "AllocateKernelMemory error"
+#if FEATURE_LAST_BOOT   // the above code cause "AllocateKernelMemory error"
 	// Bungo: select last booted partition as the boot volume
 	// TODO: support other OSes (foreign boot)
 	for (bvr = chain; bvr; bvr = bvr->next)
@@ -1140,7 +1140,7 @@
 	}
 
 	bvr = bvr2 ? bvr2 : (bvr1 ? bvr1 : chain);
-#if DEBUG_FEATURE_LAST_BOOT
+#if FEATURE_LAST_BOOT
 	label = bvr->label[0] ? bvr->label : (bvr->altlabel[0] ? bvr->altlabel : (bvr->name[0] ? bvr->name : "Untitled"));
 	DBG("Default partition set: hd(%d,%d) '%s'\n", BIOS_DEV_UNIT(bvr), bvr->part_no, label);
 #endif
Index: trunk/i386/libsaio/biosfn.c
===================================================================
--- trunk/i386/libsaio/biosfn.c	(revision 2708)
+++ trunk/i386/libsaio/biosfn.c	(revision 2709)
@@ -44,7 +44,7 @@
 #include "libsaio.h"
 
 
-#ifndef DEBUG_MEMRANGE
+#ifndef MEMRANGE
 	#define MEMRANGE 0
 #endif