Index: ftk/src/ftk.h
===================================================================
--- ftk/src/ftk.h.orig	2007-03-29 16:09:57.000000000 +0200
+++ ftk/src/ftk.h	2011-06-02 15:45:22.283023559 +0200
@@ -330,8 +330,10 @@
 		#endif
 
 		#if defined( FLM_WIN) || defined( FLM_NLM)
+			#define FLMATOMIC_RET		long
 			#define FLMATOMIC		volatile long
 		#else
+			#define FLMATOMIC_RET		int
 			#define FLMATOMIC		volatile int
 		#endif
 	
@@ -3943,7 +3945,7 @@
 	} F_TMSTAMP;
 
 	#define f_timeIsLeapYear(year) \
-		((((year) & 0x03) == 0) && (((year) % 100) != 0) || (((year) % 400) == 0))
+		(((((year) & 0x03) == 0) && (((year) % 100) != 0)) || (((year) % 400) == 0))
 
 	void f_timeGetSeconds(
 		FLMUINT	*		puiSeconds);
Index: ftk/src/ftksys.h
===================================================================
--- ftk/src/ftksys.h.orig	2007-03-29 16:09:57.000000000 +0200
+++ ftk/src/ftksys.h	2011-06-02 15:45:22.284023465 +0200
@@ -218,7 +218,7 @@
 	Desc:
 	**********************************************************************/
 	#if defined( FLM_PPC) && defined( FLM_GNUC) && defined( FLM_LINUX)
-		extern "C"  FLMATOMIC ppc_atomic_add(
+		extern "C"  FLMATOMIC_RET ppc_atomic_add(
 			FLMATOMIC *		piTarget,
 			FLMINT32			iDelta);
 	#endif
@@ -227,7 +227,7 @@
 	Desc:
 	**********************************************************************/
 	#if defined( FLM_PPC) && defined( FLM_GNUC) && defined( FLM_LINUX)
-		extern "C"  FLMATOMIC ppc_atomic_xchg(
+		extern "C"  FLMATOMIC_RET ppc_atomic_xchg(
 			FLMATOMIC *		piTarget,
 			FLMATOMIC		iNewValue);
 	#endif
Index: ftk/src/ftkunix.cpp
===================================================================
--- ftk/src/ftkunix.cpp.orig	2007-03-29 16:09:57.000000000 +0200
+++ ftk/src/ftkunix.cpp	2011-06-02 15:45:22.284023465 +0200
@@ -1356,7 +1356,7 @@ extern "C" void sparc_atomic_code( void)
 Desc:
 ****************************************************************************/
 #if defined( FLM_PPC) && defined( FLM_GNUC)
-FLMATOMIC ppc_atomic_add(
+FLMATOMIC_RET ppc_atomic_add(
 	FLMATOMIC *		piTarget,
 	FLMINT32			iDelta)
 {
@@ -1381,7 +1381,7 @@ FLMATOMIC ppc_atomic_add(
 Desc:
 ****************************************************************************/
 #if defined( FLM_PPC) && defined( FLM_GNUC)
-FLMATOMIC ppc_atomic_xchg(
+FLMATOMIC_RET ppc_atomic_xchg(
 	FLMATOMIC *		piTarget,
 	FLMATOMIC		iNewValue)
 {
Index: src/kybuild.cpp
===================================================================
--- src/kybuild.cpp.orig	2007-03-29 16:09:57.000000000 +0200
+++ src/kybuild.cpp	2011-06-02 15:45:22.286023277 +0200
@@ -534,8 +534,8 @@ FSTATIC RCODE flmProcessIndexedFld(
 				if (pIxd->uiFlags & IXD_OFFLINE)
 				{
 					if (uiContainerNum > pIxd->uiLastContainerIndexed ||
-						 uiContainerNum == pIxd->uiLastContainerIndexed &&
-						 uiDrn > pIxd->uiLastDrnIndexed)
+						 ( uiContainerNum == pIxd->uiLastContainerIndexed &&
+						 uiDrn > pIxd->uiLastDrnIndexed ) )
 					{
 						continue;
 					}
Index: Makefile
===================================================================
--- Makefile.orig	2007-03-29 16:09:57.000000000 +0200
+++ Makefile	2011-06-02 15:46:24.264179045 +0200
@@ -1017,7 +1017,7 @@ ifdef unix_target
 	# Compiler defines and flags
 
 	ifeq ($(compiler),g++)
-		ccflags += -Wall -Werror -fPIC
+		ccflags += -Wall -fPIC
 		ifneq ($(target_processor_family),ia64)
 			ccflags += -m$(target_word_size)
 		endif