[ros-diffs] [cwittich] 30673: fix msvc build

Author: cwittich
Date: Thu Nov 22 17:28:21 2007
New Revision: 30673

URL: http://svn.reactos.org/svn/reactos?rev=30673&view=rev
Log:
fix msvc build

Modified:
    trunk/reactos/lib/fslib/vfatlib/vfatlib.h
    trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h

Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.h...
==============================================================================
--- trunk/reactos/lib/fslib/vfatlib/vfatlib.h (original)
+++ trunk/reactos/lib/fslib/vfatlib/vfatlib.h Thu Nov 22 17:28:21 2007
@@ -12,6 +12,7 @@

#define SECTORSIZE 512

+#include <pshpack1.h>
 typedef struct _FAT16_BOOT_SECTOR
 {
   unsigned char  magic0;                      // 0
@@ -38,7 +39,7 @@
   unsigned char  SysType[8];                  // 54
   unsigned char  Res2[446];                   // 62
   unsigned long  Signature1;                  // 508
-} __attribute__((packed)) FAT16_BOOT_SECTOR, *PFAT16_BOOT_SECTOR;
+} FAT16_BOOT_SECTOR, *PFAT16_BOOT_SECTOR;

typedef struct _FAT32_BOOT_SECTOR
@@ -74,7 +75,7 @@
   unsigned char  SysType[8];                  // 82
   unsigned char  Res2[418];                   // 90
   unsigned long  Signature1;                  // 508
-} __attribute__((packed)) FAT32_BOOT_SECTOR, *PFAT32_BOOT_SECTOR;
+} FAT32_BOOT_SECTOR, *PFAT32_BOOT_SECTOR;

typedef struct _FAT32_FSINFO
 {
@@ -85,8 +86,8 @@
   unsigned long  NextFree;         // 492
   unsigned long  Res2[3];          // 496
   unsigned long  TrailSig;         // 508
-} __attribute__((packed)) FAT32_FSINFO, *PFAT32_FSINFO;
-
+} FAT32_FSINFO, *PFAT32_FSINFO;
+#include <poppack.h>

typedef struct _FORMAT_CONTEXT
 {

Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/vfatxlib...
==============================================================================
--- trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h (original)
+++ trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h Thu Nov 22 17:28:21 2007
@@ -9,6 +9,7 @@
 #include <ndk/ntndk.h>
 #include <fmifs/fmifs.h>

+#include <pshpack1.h>
 typedef struct _FATX_BOOT_SECTOR
 {
    unsigned char SysType[4];        // 0
@@ -17,8 +18,8 @@
    unsigned short FATCount;         // 12
    unsigned long Unknown;           // 14
    unsigned char Unused[4078];      // 18
-} __attribute__((packed)) FATX_BOOT_SECTOR, *PFATX_BOOT_SECTOR;
-
+} FATX_BOOT_SECTOR, *PFATX_BOOT_SECTOR;
+#include <poppack.h>

typedef struct _FORMAT_CONTEXT
 {