summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2006-12-09 09:54:02 +0000
committerJonathan Kew <jfkthame@googlemail.com>2006-12-09 09:54:02 +0000
commitb1875e8b61fed1cf86021172dae6bff7676ff286 (patch)
tree07fc5b7e14dc4199f0421180a4d54f7bca333320
parent8ba33cb45ba58b13a6282e09abd03e07e0cbea24 (diff)
patch teckit sources for AIX
git-svn-id: svn://tug.org/texlive/trunk@2650 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/libs/teckit/source/Compiler.cpp7
-rwxr-xr-xBuild/source/libs/teckit/source/Engine.cpp7
2 files changed, 8 insertions, 6 deletions
diff --git a/Build/source/libs/teckit/source/Compiler.cpp b/Build/source/libs/teckit/source/Compiler.cpp
index 67b52139a64..9ce27bb682a 100755
--- a/Build/source/libs/teckit/source/Compiler.cpp
+++ b/Build/source/libs/teckit/source/Compiler.cpp
@@ -13,6 +13,7 @@ Description:
-------------------------------------------------------------------------*/
/*
+ 2006-12-09 jk patch from Vladimir Volovich to build on AIX
2006-01-12 jk removed multi-char constants, use FOUR_CHAR_CODE to define UInt32 values instead
(no functional change, just to avoid compiler warnings)
2005-07-07 jk 2.1.5 changed to use WORDS_BIGENDIAN rather than TARGET_RT_BIG_ENDIAN
@@ -188,13 +189,13 @@ TECkit_DisposeCompiled(Byte* table)
}
-static inline UInt8
+inline UInt8
READ(const UInt8 p)
{
return p;
}
-static inline UInt16
+inline UInt16
READ(const UInt16 p)
{
#ifdef WORDS_BIGENDIAN
@@ -204,7 +205,7 @@ READ(const UInt16 p)
#endif
}
-static inline UInt32
+inline UInt32
READ(const UInt32 p)
{
#ifdef WORDS_BIGENDIAN
diff --git a/Build/source/libs/teckit/source/Engine.cpp b/Build/source/libs/teckit/source/Engine.cpp
index c7c2eb86a91..be648953a6c 100755
--- a/Build/source/libs/teckit/source/Engine.cpp
+++ b/Build/source/libs/teckit/source/Engine.cpp
@@ -13,6 +13,7 @@ Description:
-------------------------------------------------------------------------*/
/*
+ 2006-12-09 jk patch from Vladimir Volovich to build on AIX
2006-06-02 jk added support for extended string rules (>255 per initial char)
2006-06-02 jk fixed bug handling passes with no mapping rules
2006-01-12 jk remove multi-char constants, use kTableType_XXX from TECkit_Format.h
@@ -71,13 +72,13 @@ int traceLevel = 1;
using namespace std;
/* we apply READ to values read from the compiled table, to provide byte-swapping where needed */
-static inline UInt8
+inline UInt8
READ(const UInt8 p)
{
return p;
}
-static inline UInt16
+inline UInt16
READ(const UInt16 p)
{
#ifdef WORDS_BIGENDIAN
@@ -87,7 +88,7 @@ READ(const UInt16 p)
#endif
}
-static inline UInt32
+inline UInt32
READ(const UInt32 p)
{
#ifdef WORDS_BIGENDIAN