dbp/ifolder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dev-db/libflaim: add stable version

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1600 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2009-12-03 10:04:10 +00:00
parent fa282e1c4c
commit 3678af3dd7
6 changed files with 157 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dev-db/libflaim/files/libflaim-gcc43.patch Normal file
View File

@@ -0,0 +1,24 @@
--- flaim/src/kybuild.cpp 2008-02-15 20:02:22.000000000 +0000
+++ flaim/src/kybuild.cpp 2008-02-15 20:02:50.000000000 +0000
@@ -533,8 +533,8 @@
if (pIxd->uiFlags & IXD_OFFLINE)
{
if (uiContainerNum > pIxd->uiLastContainerIndexed ||
- uiContainerNum == pIxd->uiLastContainerIndexed &&
- uiDrn > pIxd->uiLastDrnIndexed)
+ (uiContainerNum == pIxd->uiLastContainerIndexed &&
+ uiDrn > pIxd->uiLastDrnIndexed))
{
continue;
}
--- flaim/ftk/src/ftk.h 2006-10-12 23:56:32.000000000 +0100
+++ flaim/ftk/src/ftk.h 2008-02-15 21:00:17.000000000 +0000
@@ -3687,7 +3687,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);

12
dev-db/libflaim/files/libflaim-gcc44.patch Normal file
View File

@@ -0,0 +1,12 @@
--- ftkdir.cpp.orig 2006-10-13 02:56:32 +0400
+++ ftk/src/ftkdir.cpp 2007-05-25 00:48:30 +0400
@@ -1075,7 +1075,8 @@
if( (PathSeparator = strrchr( DirInfo->full_path, '/')) == NULL)
#endif
{
- (void) getcwd( DirInfo->full_path, F_PATH_MAX_SIZE);
+ if (!getcwd( DirInfo->full_path, F_PATH_MAX_SIZE))
+ return (EINVAL);
uiLen = f_strlen( DirInfo->full_path );
DirInfo->full_path[uiLen] = '/';
DirInfo->full_path[uiLen+1] = '\0';

75
dev-db/libflaim/files/libflaim-warning.patch Normal file
View File

@@ -0,0 +1,75 @@
--- 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/kybuild.cpp
+++ src/kybuild.cpp
@@ -534,8 +534,8 @@
if (pIxd->uiFlags & IXD_OFFLINE)
{
if (uiContainerNum > pIxd->uiLastContainerIndexed ||
- uiContainerNum == pIxd->uiLastContainerIndexed &&
- uiDrn > pIxd->uiLastDrnIndexed)
+ ( uiContainerNum == pIxd->uiLastContainerIndexed &&
+ uiDrn > pIxd->uiLastDrnIndexed ) )
{
continue;
}