From 7ee554d5ae9ece0514913c95e094e55661da74da Mon Sep 17 00:00:00 2001
From: ahodgkinson <ahodgkinson@0109f412-320b-0410-ab79-c3e0c5ffbbe6>
Date: Thu, 12 Oct 2006 18:59:06 +0000
Subject: [PATCH] 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        | 1 +
 ftk/util/ftktest.cpp | 9 ++++++---
 xflaim/Makefile      | 4 ++--
 xflaim/src/xflaim.h  | 7 +++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ftk/src/ftk.h b/ftk/src/ftk.h
index ed51558..35562b2 100644
--- a/ftk/src/ftk.h
+++ b/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.
 
diff --git a/ftk/util/ftktest.cpp b/ftk/util/ftktest.cpp
index f596fca..97773be 100644
--- a/ftk/util/ftktest.cpp
+++ b/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:
diff --git a/xflaim/Makefile b/xflaim/Makefile
index d5f95a2..0035c1d 100644
--- a/xflaim/Makefile
+++ b/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
diff --git a/xflaim/src/xflaim.h b/xflaim/src/xflaim.h
index 133a753..2207d8b 100644
--- a/xflaim/src/xflaim.h
+++ b/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