File libxflaim-warning.patch of Package libxflaim

Overview Repositories Revisions Requests Users Attributes Meta

File libxflaim-warning.patch of Package libxflaim (Revision 2e845f8b0f155c6910b0130625ea878b)

Currently displaying revision 2e845f8b0f155c6910b0130625ea878b , Show latest

--- ftk/src/ftk.h
+++ ftk/src/ftk.h
@@ -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);
--- ftk/src/ftksys.h
+++ ftk/src/ftksys.h
@@ -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
--- ftk/src/ftkunix.cpp
+++ ftk/src/ftkunix.cpp
@@ -1356,7 +1356,7 @@
 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 @@
 Desc:
 ****************************************************************************/
 #if defined( FLM_PPC) && defined( FLM_GNUC)
-FLMATOMIC ppc_atomic_xchg(
+FLMATOMIC_RET ppc_atomic_xchg(
 	FLMATOMIC *		piTarget,
 	FLMATOMIC		iNewValue)
 {
--- src/flverify.cpp
+++ src/flverify.cpp
@@ -3682,8 +3682,8 @@
 			// A key length of 0 is valid.  It refers to the LEM.  All keys are
 			// less than the LEM if their length is > 0.
 
-			if ((uiResetKeyLen && pStateInfo->uiElmKeyLen ||
-					!pStateInfo->uiElmKeyLen))
+			if ((uiResetKeyLen && pStateInfo->uiElmKeyLen) ||
+					!pStateInfo->uiElmKeyLen)
 			{
 				// If we passed the target key, or we are on the last element
 				// then count it.
--- src/fquery.cpp
+++ src/fquery.cpp
@@ -4085,8 +4085,8 @@
 	// a single constant if possible.
 
 	if (pQNode->eNodeType == FLM_VALUE_NODE ||
-		 pQNode->eNodeType == FLM_OPERATOR_NODE &&
-		 isArithOp( pQNode->nd.op.eOperator))
+		 (pQNode->eNodeType == FLM_OPERATOR_NODE &&
+		 isArithOp( pQNode->nd.op.eOperator)))
 	{
 		bGetPredicates = FALSE;
 	}

Places

File libxflaim-warning.patch of Package libxflaim (Revision 2e845f8b0f155c6910b0130625ea878b)

Places