[Linux-NTFS-cvs] CVS: linux-ntfs/include attrib.h,1.46,1.47 bitmap.h,1.10,1.11 bootsect.h,1.12,1.13 debug.h,1.4,1.5 dir.h,1.4,1.5 disk_io.h,1.17,1.18 endians.h,1.6,1.7 inode.h,1.11,1.12 layout.h,1.24,1.25 list.h,1.5,1.6 logfile.h,1.14,1.15 mft.h,1.36,1.37 mst.h,1.6,1.7 runlist.h,1.2,1.3 support.h,1.5,1.6 types.h,1.11,1.12 unistr.h,1.16,1.17 volume.h,1.26,1.27

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv17019/include

Modified Files:
	attrib.h bitmap.h bootsect.h debug.h dir.h disk_io.h endians.h 
	inode.h layout.h list.h logfile.h mft.h mst.h runlist.h 
	support.h types.h unistr.h volume.h 
Log Message:
whitespace and include guards


Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -U2 -r1.46 -r1.47
--- attrib.h	11 Jul 2002 13:18:11 -0000	1.46
+++ attrib.h	11 Jul 2002 16:20:32 -0000	1.47
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef ATTRIB_H
-#define ATTRIB_H
+#ifndef _NTFS_ATTRIB_H
+#define _NTFS_ATTRIB_H
 
 /* Forward declarations */
@@ -271,5 +271,5 @@
  * @b:		pointer to a buffer containing the mft record of FILE_Volume
  * @flags:	new flags
- * 
+ *
  * Set the volume flags in the mft record buffer @b and on volume @v to @flags.
  * Return 1 on success or 0 on error.
@@ -283,5 +283,5 @@
  * Return the byte size of the attribute value of the attribute @a (as it
  * would be after eventual decompression and filling in of holes if sparse).
- * If we return 0, check errno. If errno is 0 the actual length was 0, 
+ * If we return 0, check errno. If errno is 0 the actual length was 0,
  * otherwise errno describes the error.
  *
@@ -295,5 +295,5 @@
  * @a:		attribute to get the value of
  * @b:		destination buffer for the attribute value
- * 
+ *
  * Make a copy of the attribute value of the attribute @a into the destination
  * buffer @b. Note, that the size of @b has to be at least equal to the value
@@ -315,5 +315,5 @@
  *
  * Set the value of the attribute @a to the contents of the buffer @b which has
- * a byte-size of @l and write it to the NTFS volume @vol. 
+ * a byte-size of @l and write it to the NTFS volume @vol.
  * Return 1 on success and 0 on error, errno will be set in the latter case.
  *
@@ -328,4 +328,4 @@
 		const u8 *b, s64 l);
 
-#endif /* defined ATTRIB_H */
+#endif /* defined _NTFS_ATTRIB_H */
 

Index: bitmap.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bitmap.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- bitmap.h	2 Jul 2002 23:47:10 -0000	1.10
+++ bitmap.h	11 Jul 2002 16:20:32 -0000	1.11
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef BITMAP_H
-#define BITMAP_H
+#ifndef _NTFS_BITMAP_H
+#define _NTFS_BITMAP_H
 
 #include "types.h"
@@ -61,5 +61,5 @@
  * @bitmap:	field of bits
  * @bit:	bit to get
- * 
+ *
  * Get and return the value of the bit @bit in @bitmap (0 or 1).
  * Return -1 on error.
@@ -84,5 +84,5 @@
  * @bit:	bit to get/set
  * @new_value:	value to set bit to (0 or 1)
- * 
+ *
  * Return the value of the bit @bit and set it to @new_value (0 or 1).
  * Return -1 on error.
@@ -92,5 +92,5 @@
 {
 	register u8 old_bit, shift;
-	
+
 	if (!bitmap || new_value > 1)
 		return -1;
@@ -98,8 +98,8 @@
 	old_bit = (bitmap[bit >> 3] >> shift) & 1;
 	if (new_value != old_bit)
-		bitmap[bit >> 3] ^= 1 << shift; 
+		bitmap[bit >> 3] ^= 1 << shift;
 	return old_bit;
 }
 
-#endif /* defined BITMAP_H */
+#endif /* defined _NTFS_BITMAP_H */
 

Index: bootsect.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bootsect.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- bootsect.h	11 Jul 2002 13:18:11 -0000	1.12
+++ bootsect.h	11 Jul 2002 16:20:32 -0000	1.13
@@ -12,17 +12,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef BOOTSECT_H
-#define BOOTSECT_H
+#ifndef _NTFS_BOOTSECT_H
+#define _NTFS_BOOTSECT_H
 
 #include "types.h"
@@ -34,5 +34,5 @@
  * @b:		buffer containing the boot sector
  * @silent:	if 1 don't display progress information
- * 
+ *
  * This function checks the boot sector in @b for describing a valid ntfs
  * volume. Return TRUE if @b is a valid NTFS boot sector or FALSE otherwise.
@@ -45,4 +45,4 @@
 extern int parse_ntfs_boot_sector(ntfs_volume *vol, const NTFS_BOOT_SECTOR *b);
 
-#endif /* defined BOOTSECT_H */
+#endif /* defined _NTFS_BOOTSECT_H */
 

Index: debug.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/debug.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- debug.h	22 Apr 2002 10:34:31 -0000	1.4
+++ debug.h	11 Jul 2002 16:20:32 -0000	1.5
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef _NTFS_DEBUG_H
+#define _NTFS_DEBUG_H
 
 #include "attrib.h"
@@ -77,4 +77,4 @@
 #endif
 
-#endif /* defined DEBUG_H */
+#endif /* defined _NTFS_DEBUG_H */
 

Index: dir.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/dir.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- dir.h	2 Jul 2002 23:47:10 -0000	1.4
+++ dir.h	11 Jul 2002 16:20:32 -0000	1.5
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NTFS_DIR_H
-#define NTFS_DIR_H
+#ifndef _NTFS_DIR_H
+#define _NTFS_DIR_H
 
 #include "types.h"
@@ -59,4 +59,4 @@
 		void *dirent, ntfs_filldir_t filldir);
 
-#endif /* defined NTFS_DIR_H */
+#endif /* defined _NTFS_DIR_H */
 

Index: disk_io.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/disk_io.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- disk_io.h	2 Jul 2002 23:47:10 -0000	1.17
+++ disk_io.h	11 Jul 2002 16:20:32 -0000	1.18
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DISK_IO_H
-#define DISK_IO_H
+#ifndef _NTFS_DISK_IO_H
+#define _NTFS_DISK_IO_H
 
 #include "volume.h"
@@ -40,4 +40,4 @@
 		const s64 count, const void *b);
 
-#endif /* defined DISK_IO_H */
+#endif /* defined _NTFS_DISK_IO_H */
 

Index: endians.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/endians.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- endians.h	2 Jul 2002 23:47:10 -0000	1.6
+++ endians.h	11 Jul 2002 16:20:32 -0000	1.7
@@ -4,5 +4,5 @@
  * endians.h - Definitions related to handling of byte ordering. Part of the
  * 	       Linux-NTFS project.
- * 	       
+ *
  * Copyright (c) 2000,2001 Anton Altaparmakov.
  *
@@ -12,16 +12,19 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* 
+#ifndef _NTFS_ENDIANS_H
+#define _NTFS_ENDIANS_H
+
+/*
  * Notes:
  *
@@ -29,11 +32,8 @@
  * defaults don't necessarily perform appropriate typecasts.
  * 	Also, using our own functions means that we can change them if it
- * turns out that we do need to use the unaligned access macros on 
+ * turns out that we do need to use the unaligned access macros on
  * architectures requirering aligned memory accesses...
  */
 
-#ifndef ENDIANS_H
-#define ENDIANS_H
-
 #include <asm/byteorder.h>
 
@@ -89,4 +89,4 @@
 #define const_cpu_to_le64(x)	__constant_cpu_to_le64(x)
 
-#endif /* defined ENDIANS_H */
+#endif /* defined _NTFS_ENDIANS_H */
 

Index: inode.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/inode.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- inode.h	11 Jul 2002 13:18:11 -0000	1.11
+++ inode.h	11 Jul 2002 16:20:32 -0000	1.12
@@ -1,3 +1,5 @@
 /*
+ * $Id$
+ *
  * inode.h - Defines for NTFS inode handling. Part of the Linux-NTFS project.
  *
@@ -9,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NTFS_INODE_H
-#define NTFS_INODE_H
+#ifndef _NTFS_INODE_H
+#define _NTFS_INODE_H
 
 /* Forward declaration */
@@ -106,4 +108,4 @@
 		const MFT_REF mref);
 
-#endif /* NTFS_INODE_H */
+#endif /* defined _NTFS_INODE_H */
 

Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/layout.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -U2 -r1.24 -r1.25
--- layout.h	11 Jul 2002 13:18:11 -0000	1.24
+++ layout.h	11 Jul 2002 16:20:32 -0000	1.25
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef LAYOUT_H
-#define LAYOUT_H
+#ifndef _NTFS_LAYOUT_H
+#define _NTFS_LAYOUT_H
 
 #include "types.h"
@@ -39,5 +39,5 @@
  * 	from within Windows as the bootsector contained number of sectors
  *	value is one less than the actual value!).
- * 	On versions of NT 3.51 and earlier, the backup copy was located at 
+ * 	On versions of NT 3.51 and earlier, the backup copy was located at
  * 	number of sectors/2 (integer divide), i.e. in the middle of the volume.
  */
@@ -132,5 +132,5 @@
 
 /*
- * Defines for the NTFS filesystem. Don't want to use BLOCK_SIZE and 
+ * Defines for the NTFS filesystem. Don't want to use BLOCK_SIZE and
  * BLOCK_SIZE_BITS from the kernel as that is 1024 and hence too high for us.
  */
@@ -212,5 +212,5 @@
 
 /*
- * These are the so far known MFT_RECORD_* flags (16-bit) which contain 
+ * These are the so far known MFT_RECORD_* flags (16-bit) which contain
  * information about the mft record in which they are present.
  */
@@ -224,5 +224,5 @@
  * mft references (aka file references or file record segment references) are
  * used whenever a structure needs to refer to a record in the mft.
- * 
+ *
  * A reference consists of a 48-bit index into the mft and a 16-bit sequence
  * number used to detect stale references.
@@ -250,5 +250,5 @@
  *
  * FIXME: The mft zone is defined as the first 12% of the volume. This space is
- * reserved so that the mft can grow contiguously and hence doesn't become 
+ * reserved so that the mft can grow contiguously and hence doesn't become
  * fragmented. Volume free space includes the empty part of the mft zone and
  * when the volume's free 88% are used up, the mft zone is shrunk by a factor
@@ -301,5 +301,5 @@
 				   is done when the file is deleted. NOTE: If
 				   this is zero it is left zero. */
-/* 18*/	u16 link_count; 	/* Number of hard links, i.e. the number of 
+/* 18*/	u16 link_count; 	/* Number of hard links, i.e. the number of
 				   directory entries referencing this record.
 				   NOTE: Only used in mft base records.
@@ -482,5 +482,5 @@
 
 /*
- * Attribute flags (16-bit). 
+ * Attribute flags (16-bit).
  */
 typedef enum {
@@ -593,5 +593,5 @@
 /* 12*/	ATTR_FLAGS flags;	/* Flags describing the attribute. */
 /* 14*/	u16 instance;		/* The instance of this attribute record. This
-				   number is unique within this mft record (see 
+				   number is unique within this mft record (see
 				   MFT_RECORD/next_attribute_instance notes in
 				   in mft.h for more details). */
@@ -603,5 +603,5 @@
 					       value from the start of the
 					       attribute record. When creating,
-					       align to 8-byte boundary if we 
+					       align to 8-byte boundary if we
 					       have a name present as this might
 					       not have a length of a multiple
@@ -696,5 +696,5 @@
 
 	FILE_ATTR_VALID_FLAGS		= const_cpu_to_le32(0x00007fb7),
-	/* FILE_ATTR_VALID_FLAGS masks out the old DOS VolId and the 
+	/* FILE_ATTR_VALID_FLAGS masks out the old DOS VolId and the
 	   FILE_ATTR_DEVICE and preserves everything else. This mask
 	   is used to obtain all flags that are valid for reading. */
@@ -826,7 +826,7 @@
  * name (if present), third by instance number. The extents of one
  * non-resident attribute (if present) immediately follow after the initial
- * extent. They are ordered by lowest_vcn and have their instace set to zero. 
+ * extent. They are ordered by lowest_vcn and have their instace set to zero.
  * It is not allowed to have two attributes with all sorting keys equal.
- * - Further restrictions: 
+ * - Further restrictions:
  * 	- If not resident, the vcn to lcn mapping array has to fit inside the
  * 	  base mft record.
@@ -886,5 +886,5 @@
 typedef enum {
 	FILE_NAME_POSIX			= 0x00,
-		/* This is the largest namespace. It is case sensitive and 
+		/* This is the largest namespace. It is case sensitive and
 		   allows all Unicode characters except for: '\0' and '/'.
 		   Beware that in WinNT/2k files which eg have the same name
@@ -894,5 +894,5 @@
 	FILE_NAME_WIN32			= 0x01,
 		/* The standard WinNT/2k NTFS long filenames. Case insensitive.
-		   All Unicode chars except: '\0', '"', '*', '/', ':', '<', 
+		   All Unicode chars except: '\0', '"', '*', '/', ':', '<',
 		   '>', '?', '\' and '|'. Further, names cannot end with a '.'
 		   or a space. */
@@ -901,5 +901,5 @@
 		   All 8-bit characters greater space, except: '"', '*', '+',
 		   ',', '/', ':', ';', '<', '=', '>', '?' and '\'. */
-	FILE_NAME_WIN32_AND_DOS		= 0x03, 
+	FILE_NAME_WIN32_AND_DOS		= 0x03,
 		/* 3 means that both the Win32 and the DOS filenames are
 		   identical and hence have been saved in this single filename
@@ -956,5 +956,5 @@
 
 /*
- * GUID structures store globally unique identifiers (GUID). A GUID is a 
+ * GUID structures store globally unique identifiers (GUID). A GUID is a
  * 128-bit value consisting of one group of eight hexadecimal digits, followed
  * by three groups of four hexadecimal digits each, followed by one group of
@@ -1040,5 +1040,5 @@
  * These relative identifiers (RIDs) are used with the above identifier
  * authorities to make up universal well-known SIDs.
- * 	
+ *
  * Note: The relative identifier (RID) refers to the portion of a SID, which
  * identifies a user or group in relation to the authority that issued the SID.
@@ -1051,5 +1051,5 @@
 	SECURITY_WORLD_RID		  = 0,	/* S-1-1 */
 	SECURITY_LOCAL_RID		  = 0,	/* S-1-2 */
-	
+
 	SECURITY_CREATOR_OWNER_RID	  = 0,	/* S-1-3 */
 	SECURITY_CREATOR_GROUP_RID	  = 1,	/* S-1-3 */
@@ -1071,8 +1071,8 @@
 	SECURITY_RESTRICTED_CODE_RID	  = 0xc,
 	SECURITY_TERMINAL_SERVER_RID	  = 0xd,
-	
+
 	SECURITY_LOGON_IDS_RID		  = 5,
 	SECURITY_LOGON_IDS_RID_COUNT	  = 3,
-	
+
 	SECURITY_LOCAL_SYSTEM_RID	  = 0x12,
 
@@ -1084,10 +1084,10 @@
 	 * Well-known domain relative sub-authority values (RIDs).
 	 */
-	
+
 	/* Users. */
 	DOMAIN_USER_RID_ADMIN		  = 0x1f4,
 	DOMAIN_USER_RID_GUEST		  = 0x1f5,
 	DOMAIN_USER_RID_KRBTGT		  = 0x1f6,
-	
+
 	/* Groups. */
 	DOMAIN_GROUP_RID_ADMINS		  = 0x200,
@@ -1106,10 +1106,10 @@
 	DOMAIN_ALIAS_RID_GUESTS		  = 0x222,
 	DOMAIN_ALIAS_RID_POWER_USERS	  = 0x223,
-	
+
 	DOMAIN_ALIAS_RID_ACCOUNT_OPS	  = 0x224,
 	DOMAIN_ALIAS_RID_SYSTEM_OPS	  = 0x225,
 	DOMAIN_ALIAS_RID_PRINT_OPS	  = 0x226,
 	DOMAIN_ALIAS_RID_BACKUP_OPS	  = 0x227,
-	
+
 	DOMAIN_ALIAS_RID_REPLICATOR	  = 0x228,
 	DOMAIN_ALIAS_RID_RAS_SERVERS	  = 0x229,
@@ -1131,5 +1131,5 @@
  *
  * NT well-known SIDs:
- * 
+ *
  * 	NT_AUTHORITY_SID	S-1-5
  * 	DIALUP_SID		S-1-5-1
@@ -1168,5 +1168,5 @@
  * The SID structure is a variable-length structure used to uniquely identify
  * users or groups. SID stands for security identifier.
- * 
+ *
  * The standard textual representation of the SID is of the form:
  * 	S-R-I-S-S...
@@ -1178,5 +1178,5 @@
  *    - I is the 48-bit identifier_authority, expressed as digits as R above.
  *    - S... is one or more sub_authority values, expressed as digits as above.
- *    
+ *
  * Example SID; the domain-relative SID of the local Administrators group on
  * Windows NT/2k:
@@ -1219,5 +1219,5 @@
 	ACCESS_ALLOWED_COMPOUND_ACE_TYPE= 4,
 	ACCESS_MAX_MS_V3_ACE_TYPE	= 4,
-	
+
 	/* The following are Win2k only. */
 	ACCESS_MIN_MS_OBJECT_ACE_TYPE	= 5,
@@ -1285,31 +1285,31 @@
 
 	/* Specific rights for files and directories are as follows: */
-	
+
 	/* Right to read data from the file. (FILE) */
 	FILE_READ_DATA			= const_cpu_to_le32(0x00000001),
 	/* Right to list contents of a directory. (DIRECTORY) */
 	FILE_LIST_DIRECTORY		= const_cpu_to_le32(0x00000001),
-	
+
 	/* Right to write data to the file. (FILE) */
 	FILE_WRITE_DATA			= const_cpu_to_le32(0x00000002),
 	/* Right to create a file in the directory. (DIRECTORY) */
 	FILE_ADD_FILE			= const_cpu_to_le32(0x00000002),
-	
+
 	/* Right to append data to the file. (FILE) */
 	FILE_APPEND_DATA		= const_cpu_to_le32(0x00000004),
 	/* Right to create a subdirectory. (DIRECTORY) */
 	FILE_ADD_SUBDIRECTORY		= const_cpu_to_le32(0x00000004),
-	
+
 	/* Right to read extended attributes. (FILE/DIRECTORY) */
 	FILE_READ_EA			= const_cpu_to_le32(0x00000008),
-	
+
 	/* Right to write extended attributes. (FILE/DIRECTORY) */
 	FILE_WRITE_EA			= const_cpu_to_le32(0x00000010),
-	
+
 	/* Right to execute a file. (FILE) */
 	FILE_EXECUTE			= const_cpu_to_le32(0x00000020),
 	/* Right to traverse the directory. (DIRECTORY) */
 	FILE_TRAVERSE			= const_cpu_to_le32(0x00000020),
-	
+
 	/*
 	 * Right to delete a directory and all the files it contains (its
@@ -1320,8 +1320,8 @@
 	/* Right to read file attributes. (FILE/DIRECTORY) */
 	FILE_READ_ATTRIBUTES		= const_cpu_to_le32(0x00000080),
-	
+
 	/* Right to change file attributes. (FILE/DIRECTORY) */
 	FILE_WRITE_ATTRIBUTES		= const_cpu_to_le32(0x00000100),
-	
+
 	/*
 	 * The standard rights (bits 16 to 23). Are independent of the type of
@@ -1356,13 +1356,13 @@
 	 * convenience and are defined by the Win32 API.
 	 */
-	
+
 	/* These are currently defined to READ_CONTROL. */
 	STANDARD_RIGHTS_READ		= const_cpu_to_le32(0x00020000),
 	STANDARD_RIGHTS_WRITE		= const_cpu_to_le32(0x00020000),
 	STANDARD_RIGHTS_EXECUTE		= const_cpu_to_le32(0x00020000),
-	
+
 	/* Combines DELETE, READ_CONTROL, WRITE_DAC, and WRITE_OWNER access. */
 	STANDARD_RIGHTS_REQUIRED	= const_cpu_to_le32(0x000f0000),
-	
+
 	/*
 	 * Combines DELETE, READ_CONTROL, WRITE_DAC, WRITE_OWNER, and
@@ -1411,5 +1411,5 @@
  * The generic mapping array. Used to denote the mapping of each generic
  * access right to a specific access mask.
- * 
+ *
  * FIXME: What exactly is this and what is it for? (AIA)
  */
@@ -1572,5 +1572,5 @@
 			   SE_SACL_PRESENT is set but sacl is NULL, a NULL ACL
 			   is specified. */
-	u32 dacl;	/* Byte offset to a discretionary ACL. Only valid, if 
+	u32 dacl;	/* Byte offset to a discretionary ACL. Only valid, if
 			   SE_DACL_PRESENT is set in the control field. If
 			   SE_DACL_PRESENT is set but dacl is NULL, a NULL ACL
@@ -1589,5 +1589,5 @@
 	u8 revision;	/* Revision level of the security descriptor. */
 	u8 alignment;
-	SECURITY_DESCRIPTOR_CONTROL control;	/* Flags qualifying the type of 
+	SECURITY_DESCRIPTOR_CONTROL control;	/* Flags qualifying the type of
 			   the descriptor as well as the following fields. */
 	SID *owner;	/* Points to a SID representing an object's owner. If
@@ -1601,5 +1601,5 @@
 			   SE_SACL_PRESENT is set but sacl is NULL, a NULL ACL
 			   is specified. */
-	ACL *dacl;	/* Points to a discretionary ACL. Only valid, if 
+	ACL *dacl;	/* Points to a discretionary ACL. Only valid, if
 			   SE_DACL_PRESENT is set in the control field. If
 			   SE_DACL_PRESENT is set but dacl is NULL, a NULL ACL
@@ -1634,9 +1634,9 @@
  * On NTFS 3.0+, all security descriptors are stored in FILE_Secure. Only one
  * referenced instance of each unique security descriptor is stored.
- * 
+ *
  * FILE_Secure contains no unnamed data attribute, i.e. it has zero length. It
  * does, however, contain two indexes ($SDH and $SII) as well as a named data
  * stream ($SDS).
- * 
+ *
  * Every unique security descriptor is assigned a unique security identifier
  * (security_id, not to be confused with a SID). The security_id is unique for
@@ -1653,10 +1653,10 @@
  * matching hash is found, but the security descriptors do not match, the
  * search in the $SDH index is continued, searching for a next matching hash.
- * 
+ *
  * When a precise match is found, the security_id coresponding to the security
  * descriptor in the $SDS attribute is read from the found $SDH index entry and
  * is stored in the $STANDARD_INFORMATION attribute of the file/directory to
  * which the security descriptor is being applied. The $STANDARD_INFORMATION
- * attribute is present in all base mft records (i.e. in all files and 
+ * attribute is present in all base mft records (i.e. in all files and
  * directories).
  *
@@ -1669,5 +1669,5 @@
  * references an entry any more.
  */
- 
+
 /*
  * This header precedes each security descriptor in the $SDS data stream.
@@ -1700,5 +1700,5 @@
 /*
  * The index entry key used in the $SII index. The collation type is
- * COLLATION_NTOFS_ULONG. 
+ * COLLATION_NTOFS_ULONG.
  */
 typedef struct {
@@ -1718,5 +1718,5 @@
 /*
  * Attribute: Volume name (0x60).
- * 
+ *
  * NOTE: Always resident.
  * NOTE: Present only in FILE_Volume.
@@ -1849,5 +1849,5 @@
 					   an index block is >= than a cluster,
 					   otherwise this will be the log of
-					   the size (like how the encoding of 
+					   the size (like how the encoding of
 					   the mft record size and the index
 					   record size found in the boot sector
@@ -1862,5 +1862,5 @@
  *
  * NOTE: Always non-resident (doesn't make sense to be resident anyway!).
- * 
+ *
  * This is an array of index blocks. Each index block starts with an
  * INDEX_BLOCK structure containing an index header, followed by a sequence of
@@ -1913,5 +1913,5 @@
 	QUOTA_FLAG_USER_MASK		= const_cpu_to_le32(0x00000007),
 		/* Bit mask for user quota flags. */
-	
+
 	/* These flags are only present in the quota defaults index entry,
 	   i.e. in the entry where owner_id = QUOTA_DEFAULTS_ID. */
@@ -1932,5 +1932,5 @@
  * The $Q index contains one entry for each existing user_id on the volume. The
  * index key is the user_id of the user/group owning this quota control entry,
- * i.e. the key is the owner_id. The user_id of the owner of a file, i.e. the 
+ * i.e. the key is the owner_id. The user_id of the owner of a file, i.e. the
  * owner_id, is found in the standard information attribute. The collation rule
  * for $Q is COLLATION_NTOFS_ULONG.
@@ -2090,5 +2090,5 @@
 	IO_REPARSE_TAG_IS_HIGH_LATENCY	= const_cpu_to_le32(0x40000000),
 	IO_REPARSE_TAG_IS_MICROSOFT	= const_cpu_to_le32(0x80000000),
-	
+
 	IO_REPARSE_TAG_RESERVED_ZERO	= const_cpu_to_le32(0x00000000),
 	IO_REPARSE_TAG_RESERVED_ONE	= const_cpu_to_le32(0x00000001),
@@ -2149,6 +2149,6 @@
  *
  * NOTE: Always non-resident. (Is this true?)
- * 
- * Like the attribute list and the index buffer list, the EA attribute value is 
+ *
+ * Like the attribute list and the index buffer list, the EA attribute value is
  * a sequence of EA_ATTR variable length records.
  *
@@ -2193,4 +2193,4 @@
 } __attribute__ ((__packed__)) LOGGED_UTILITY_STREAM, EFS_ATTR;
 
-#endif /* defined LAYOUT_H */
+#endif /* defined _NTFS_LAYOUT_H */
 

Index: list.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/list.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- list.h	30 Jun 2002 17:01:53 -0000	1.5
+++ list.h	11 Jul 2002 16:20:33 -0000	1.6
@@ -1,2 +1,25 @@
+/*
+ * $Id$
+ *
+ * list.h - Linked list implementation. Part of the Linux-NTFS project.
+ *
+ * Copyright (c)
+ *
+ * This program/include file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program (in the main directory of the Linux-NTFS
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef _NTFS_LIST_H
 #define _NTFS_LIST_H
@@ -27,5 +50,5 @@
 
 /*
- * Insert a new entry between two known consecutive entries. 
+ * Insert a new entry between two known consecutive entries.
  *
  * This is only for internal list manipulation where we know the prev/next
@@ -99,5 +122,5 @@
 {
 	__list_del(entry->prev, entry->next);
-	INIT_LIST_HEAD(entry); 
+	INIT_LIST_HEAD(entry);
 }
 
@@ -160,4 +183,4 @@
 		pos = n, n = pos->next)
 
-#endif
+#endif /* defined _NTFS_LIST_H */
 

Index: logfile.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/logfile.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- logfile.h	2 Jul 2002 23:47:10 -0000	1.14
+++ logfile.h	11 Jul 2002 16:20:33 -0000	1.15
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef LOGFILE_H
-#define LOGFILE_H
+#ifndef _NTFS_LOGFILE_H
+#define _NTFS_LOGFILE_H
 
 #include "types.h"
@@ -65,5 +65,5 @@
 				   required size of the usa and add this to the
 				   ntfs.usa_offset value. Then verify that the
-				   result is less than the value of the 
+				   result is less than the value of the
 				   restart_offset. = 0x1000 */
 	u32 log_page_size;	/* Byte size of log file records, has to be
@@ -105,5 +105,5 @@
 				   the first client record if versions are
 				   matched. The offset is otherwise assumed to
-				   be (sizeof(RESTART_AREA) + 7) & ~7, i.e. 
+				   be (sizeof(RESTART_AREA) + 7) & ~7, i.e.
 				   rounded up to first 8-byte boundary. Either
 				   way, the offset to the client array has to be
@@ -113,5 +113,5 @@
 				   client array + (log_clients * 0xa0) have to
 				   be <= SystemPageSize. = 0x30 */
-	u64 file_size;		/* Byte size of the log file. If the 
+	u64 file_size;		/* Byte size of the log file. If the
 				   restart_offset + the offset of the file_size
 				   are > 510 then corruption has occured. This
@@ -123,5 +123,5 @@
 				   then these checks are futile of course.
 				   Calculate the file_size bits and check that
-				   seq_number_bits == 0x43 - file_size bits. 
+				   seq_number_bits == 0x43 - file_size bits.
 				   = 0x400000 */
 	u32 last_lsn_data_length;/* ??? = 0, 0x40 */
@@ -159,8 +159,8 @@
 				     size uncertain, offset uncertain */
 	uchar_t client_name[0];	/* ??? Name of the client in unicode. = NTFS */
-	/* 
+	/*
 	 * Or it could be the client name is fixed size like in attr def struct
 	 * and the 8 means something else. Favouring this is that the
-	 * RESTART_CLIENT struct is assumed to be fixed size of 0xa0 bytes, 
+	 * RESTART_CLIENT struct is assumed to be fixed size of 0xa0 bytes,
 	 * just like the attr def struct! There might be parallels to be drawn
 	 * between the two.
@@ -226,5 +226,5 @@
 	u16 undo_length;
 	u16 target_attribute;
-	u16 lcns_to_follow;		   /* Number of lcn_list entries 
+	u16 lcns_to_follow;		   /* Number of lcn_list entries
 					      following this entry. */
 /* Now at ofs 0x40. */
@@ -240,4 +240,4 @@
 } __attribute__ ((__packed__)) LOG_RECORD;
 
-#endif /* defined LOGFILE_H */
+#endif /* defined _NTFS_LOGFILE_H */
 

Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -U2 -r1.36 -r1.37
--- mft.h	11 Jul 2002 13:18:11 -0000	1.36
+++ mft.h	11 Jul 2002 16:20:33 -0000	1.37
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef MFT_H
-#define MFT_H
+#ifndef _NTFS_MFT_H
+#define _NTFS_MFT_H
 
 #include "volume.h"
@@ -103,4 +103,4 @@
 }
 
-#endif /* defined MFT_H */
+#endif /* defined _NTFS_MFT_H */
 

Index: mst.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mst.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- mst.h	11 Jul 2002 13:18:11 -0000	1.6
+++ mst.h	11 Jul 2002 16:20:33 -0000	1.7
@@ -12,17 +12,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef MST_H
-#define MST_H
+#ifndef _NTFS_MST_H
+#define _NTFS_MST_H
 
 #include "types.h"
@@ -33,4 +33,4 @@
 extern void ntfs_post_write_mst_fixup(NTFS_RECORD *b);
 
-#endif /* defined MST_H */
+#endif /* defined _NTFS_MST_H */
 

Index: runlist.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/runlist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- runlist.h	11 Jul 2002 13:18:11 -0000	1.2
+++ runlist.h	11 Jul 2002 16:20:33 -0000	1.3
@@ -12,17 +12,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _RUNLIST_H_
-#define _RUNLIST_H_
+#ifndef _NTFS_RUNLIST_H
+#define _NTFS_RUNLIST_H
 
 #include "types.h"
@@ -40,8 +40,8 @@
  * @lcn:	starting lcn of the current array element
  * @length:	length in clusters of the current array element
- * 
+ *
  * The last vcn (in fact the last vcn + 1) is reached when length == 0.
- * 
- * When lcn == -1 this means that the count vcns starting at vcn are not 
+ *
+ * When lcn == -1 this means that the count vcns starting at vcn are not
  * physically allocated (i.e. this is a hole / data is sparse).
  */
@@ -66,4 +66,4 @@
 		const int dst_len, const run_list_element *rl);
 
-#endif /* _RUNLIST_H_ */
+#endif /* defined _NTFS_RUNLIST_H */
 

Index: support.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/support.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- support.h	14 Apr 2002 13:56:45 -0000	1.5
+++ support.h	11 Jul 2002 16:20:33 -0000	1.6
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef SUPPORT_H
-#define SUPPORT_H
+#ifndef _NTFS_SUPPORT_H
+#define _NTFS_SUPPORT_H
 
 #include <stddef.h>
@@ -54,4 +54,4 @@
 #define test_and_clear_bit(bit, var)	(test_bit(bit, var), clear_bit(bit, var))
 
-#endif /* defined SUPPORT_H */
+#endif /* defined _NTFS_SUPPORT_H */
 

Index: types.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/types.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- types.h	11 Jul 2002 13:18:11 -0000	1.11
+++ types.h	11 Jul 2002 16:20:33 -0000	1.12
@@ -12,17 +12,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NTFS_TYPES_H
-#define NTFS_TYPES_H
+#ifndef _NTFS_TYPES_H
+#define _NTFS_TYPES_H
 
 #include <stdint.h>
@@ -67,4 +67,4 @@
 } IGNORE_CASE_BOOL;
 
-#endif /* defined NTFS_TYPES_H */
+#endif /* defined _NTFS_TYPES_H */
 

Index: unistr.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/unistr.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- unistr.h	11 Jul 2002 13:18:11 -0000	1.16
+++ unistr.h	11 Jul 2002 16:20:33 -0000	1.17
@@ -12,17 +12,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef UNISTR_H
-#define UNISTR_H
+#ifndef _NTFS_UNISTR_H
+#define _NTFS_UNISTR_H
 
 #include "types.h"
@@ -60,4 +60,4 @@
 extern int ntfs_mbstoucs(char *ins, uchar_t **outs, int outs_len);
 
-#endif /* defined UNISTR_H */
+#endif /* defined _NTFS_UNISTR_H */
 

Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -U2 -r1.26 -r1.27
--- volume.h	11 Jul 2002 13:18:11 -0000	1.26
+++ volume.h	11 Jul 2002 16:20:33 -0000	1.27
@@ -11,17 +11,17 @@
  * (at your option) any later version.
  *
- * This program/include file is distributed in the hope that it will be 
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ * This program/include file is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program (in the main directory of the Linux-NTFS 
+ * along with this program (in the main directory of the Linux-NTFS
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef VOLUME_H
-#define VOLUME_H
+#ifndef _NTFS_VOLUME_H
+#define _NTFS_VOLUME_H
 
 #include "config.h"
@@ -132,4 +132,4 @@
 extern int ntfs_umount(ntfs_volume *vol, const BOOL force);
 
-#endif /* defined VOLUME_H */
+#endif /* defined _NTFS_VOLUME_H */