From bec23685136f78a24a78a6d8840d3865ffbccea9 Mon Sep 17 00:00:00 2001
From: Stef Walter <stef@thewalter.net>
Date: Sat, 3 Apr 2004 22:13:01 +0000
Subject: Unix porting.

---
 src/ntfs.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/ntfs.h')

diff --git a/src/ntfs.h b/src/ntfs.h
index e5eb1ec..06ca6bb 100644
--- a/src/ntfs.h
+++ b/src/ntfs.h
@@ -24,10 +24,8 @@
 #include "stddef.h"
 #include "drive.h"
 
-#pragma pack(push, ntfs)
 #pragma pack(1)
 
-
 /* WARNING Assumptions: */
 #define kNTFS_RecordLen   0x0400
 
@@ -149,7 +147,11 @@ ntfs_attribnonresident;
 #define kNTFS_NameSpaceDOS      0x02
 #define kNTFS_NameSpaceWINDOS   0x03
 
+#ifdef FC_WIDE
 #define kNTFS_MFTName           L"$MFT"
+#else
+#define kNTFS_MFTName           "$MFT"
+#endif
 
 typedef struct _ntfs_attribfilename
 {
@@ -181,7 +183,7 @@ typedef struct _ntfs_attriblistrecord
 }
 ntfs_attriblistrecord;
 
-#pragma pack(pop, ntfs)
+#pragma pack()
 
 ntfs_attribheader* ntfs_findattribute(ntfs_recordheader* record, uint32 attrType, byte* end);
 ntfs_attribheader* ntfs_nextattribute(ntfs_attribheader* attrib, uint32 attrType, byte* end);
@@ -193,6 +195,6 @@ bool ntfs_dofixups(byte* cluster, uint32 size);
 
 /* TODO: Move these declarations elsewhere */
 char* unicode_transcode16to8(const wchar_t* src, size_t len);
-wchar_t* unicode_transcode8to16(const char* src, const wchar_t* out, size_t len);
+wchar_t* unicode_transcode8to16(const char* src, wchar_t* out, size_t len);
 
 #endif /* __NTFS_H__ */
-- 
cgit v1.2.3