XFLAIM. Changes to remove 1-byte packing (zp1) flags from build.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@988 0109f412-320b-0410-ab79-c3e0c5ffbbe6

ftk/src/ftk.h

@@ -379,6 +379,7 @@
 	#if !defined( FLM_UNIX) && !defined( FLM_64BIT)
 		#define FLM_PACK_STRUCTS
 		#ifdef FLM_WIN
+
 			// For some reason, Windows emits a warning when the packing
 			// is changed.
 

ftk/util/ftktest.cpp

@@ -6201,9 +6201,12 @@ RCODE ftkTestBTree( void)
 				goto Exit;
 			}
 		}
-
-		f_assert( uiKeyLen == sizeof( ucKey));
-		f_assert( ui32Loop == f_bigEndianToUINT32( ucKey));
+		
+		if( uiKeyLen != sizeof( ucKey) || ui32Loop != f_bigEndianToUINT32( ucKey))
+		{
+			rc = RC_SET_AND_ASSERT( NE_FLM_FAILURE);
+			goto Exit;
+		}
 	}
 	
 Exit:

xflaim/Makefile

@@ -917,7 +917,7 @@ ifdef win_target
 
 	# Compiler defines and flags
 
-	ccflags += /nologo /c /GF /GR /J /MD /W4 /WX /Zi /Zp1
+	ccflags += /nologo /c /GF /GR /J /MD /W4 /WX /Zi
 	ccdefs += _CRT_SECURE_NO_DEPRECATE
 	ccdefs += WIN32_LEAN_AND_MEAN
 	ccdefs += WIN32_EXTRA_LEAN
@@ -1304,7 +1304,7 @@ ifdef netware_target
 		ccdefs += FLM_LIBC_NLM
 	endif
 
-	ccflags += /ez /6s /w4 /za /zp1 /zq /zm /s /ei /of+ /we /bt=NETWARE
+	ccflags += /ez /6s /w4 /za /zq /zm /s /ei /of+ /we /bt=NETWARE
 
 	ifeq ($(target_build_type),release)
 		ccflags += /oair

xflaim/src/xflaim.h

@@ -28,6 +28,10 @@
 
 	#include "xflaimtk.h"
 	
+	#ifdef FLM_PACK_STRUCTS
+		#pragma pack(push, 1)
+	#endif
+
 	/****************************************************************************
 									Forward References
 	****************************************************************************/
@@ -5055,5 +5059,8 @@
 
 	*/
 
+	#ifdef FLM_PACK_STRUCTS
+		#pragma pack(pop)
+	#endif
 
 #endif // XFLAIM_H