From e9b758fd06a65eed7934f18b197de785722c8753 Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Thu, 7 Sep 2006 18:35:02 +0000 Subject: [PATCH] FTK change. Fixed AIX xlc 64-bit build. Also incremented the library version numbers. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@819 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- ftk/Makefile | 6 +++--- ftk/src/ftk.h | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ftk/Makefile b/ftk/Makefile index 51760a8..10daadd 100644 --- a/ftk/Makefile +++ b/ftk/Makefile @@ -145,7 +145,7 @@ endif # -- Versions -- major_version = 1 -minor_version = 1 +minor_version = 2 version = $(major_version).$(minor_version).$(svn_revision) @@ -158,8 +158,8 @@ version = $(major_version).$(minor_version).$(svn_revision) # 5. If any interfaces have been added since the last public release, increment age # 6. If any interfaces have been removed since the last public release, set age to 0 -so_current = 2 -so_revision = 1 +so_current = 3 +so_revision = 2 so_age = 0 shared_lib_version = diff --git a/ftk/src/ftk.h b/ftk/src/ftk.h index 43d06d0..8e35901 100644 --- a/ftk/src/ftk.h +++ b/ftk/src/ftk.h @@ -204,7 +204,9 @@ #if !defined( FLM_64BIT) && !defined( FLM_32BIT) #if defined( FLM_UNIX) #if defined( __x86_64__) || defined( _M_X64) || \ - defined( _LP64) || defined( __LP64__) || defined( __sparcv9) + defined( _LP64) || defined( __LP64__) || \ + defined ( __64BIT__) || defined( __arch64__) || \ + defined( __sparcv9) || defined( __sparcv9__) #define FLM_64BIT #endif #endif @@ -218,7 +220,8 @@ #if defined( __x86_64__) || defined( _M_X64) || \ defined( _LP64) || defined( __LP64__) || \ - defined( __arch64__) || defined( __sparcv9) || defined( __sparcv9__) + defined ( __64BIT__) || defined( __arch64__) || \ + defined( __sparcv9) || defined( __sparcv9__) #if !defined( FLM_64BIT) #error Platform word size is incorrect #endif