summaryrefslogtreecommitdiff
path: root/Build/source/libs/teckit
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-10-13 10:46:20 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-10-13 10:46:20 +0000
commit5347e82ab228a003df517945d17a3bb2bedddc3c (patch)
tree5670ca02854e6767b59d49caf298c244acdde94c /Build/source/libs/teckit
parent71f4dd313248c2db8fef21a4c5c3d3c14a5af46a (diff)
teckit: Avoid TL vs W32TeX diffs (from Akira)
git-svn-id: svn://tug.org/texlive/trunk@27956 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/teckit')
-rw-r--r--Build/source/libs/teckit/TECkit-2.5.3-PATCHES/ChangeLog6
-rw-r--r--Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-04-pragmas63
-rw-r--r--Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-05-static44
-rw-r--r--Build/source/libs/teckit/TECkit-2.5.3/source/Engine.cpp16
-rw-r--r--Build/source/libs/teckit/TECkit-2.5.3/source/Public-headers/TECkit_Compiler.h3
-rw-r--r--Build/source/libs/teckit/TECkit-2.5.3/source/Public-headers/TECkit_Engine.h3
-rw-r--r--Build/source/libs/teckit/TECkit-2.5.3/source/Sample-tools/TECkit_Compile.cpp2
7 files changed, 119 insertions, 18 deletions
diff --git a/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/ChangeLog b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/ChangeLog
index ed0afbeae9a..84803116f15 100644
--- a/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/ChangeLog
+++ b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Avoid TL vs W32TeX diffs (from Akira).
+ * patch-04-pragmas (new): Remove '#pragma's.
+ * patch-05-static (new): Build a static library and not a Dll.
+
2012-03-17 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported TECkit-2.5.3 source tree (teckit) from
diff --git a/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-04-pragmas b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-04-pragmas
new file mode 100644
index 00000000000..a4d8d10d904
--- /dev/null
+++ b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-04-pragmas
@@ -0,0 +1,63 @@
+ Remove the '#pragma's, they seem to cause problems for MSVC
+ and are certainly not needed otherwise.
+
+diff -ur TECkit-2.5.3.orig/source/Engine.cpp TECkit-2.5.3/source/Engine.cpp
+--- TECkit-2.5.3.orig/source/Engine.cpp 2012-03-17 17:43:26.000000000 +0100
++++ TECkit-2.5.3/source/Engine.cpp 2012-10-13 12:30:24.000000000 +0200
+@@ -102,8 +102,6 @@
+ #endif
+ }
+
+-#pragma mark --- class Stage ---
+-
+ Stage::Stage()
+ : oBuffer(0)
+ , oBufSize(0)
+@@ -125,8 +117,6 @@
+ return 0;
+ }
+
+-#pragma mark --- class Normalizer ---
+-
+ #include "NormalizationData.c"
+
+ Normalizer::Normalizer(bool compose)
+@@ -396,8 +392,6 @@
+ return c;
+ }
+
+-#pragma mark --- class Pass ---
+-
+ Pass::Pass(const TableHeader* inTable, Converter* cnv)
+ : converter(cnv)
+ , tableHeader(inTable)
+@@ -1282,8 +1276,6 @@
+ return 0;
+ }
+
+-#pragma mark --- class Converter ---
+-
+ Converter::Converter(const Byte* inTable, UInt32 inTableSize, bool inForward,
+ UInt16 inForm, UInt16 outForm)
+ : table(0)
+@@ -1935,8 +1927,6 @@
+ return true;
+ }
+
+-#pragma mark --- Public "C" API functions ---
+-
+ TECkit_Status
+ WINAPI
+ TECkit_CreateConverter(
+diff -ur TECkit-2.5.3.orig/source/Sample-tools/TECkit_Compile.cpp TECkit-2.5.3/source/Sample-tools/TECkit_Compile.cpp
+--- TECkit-2.5.3.orig/source/Sample-tools/TECkit_Compile.cpp 2012-03-17 17:43:26.000000000 +0100
++++ TECkit-2.5.3/source/Sample-tools/TECkit_Compile.cpp 2012-10-13 12:28:29.000000000 +0200
+@@ -32,8 +32,6 @@
+ CALLBACK
+ errFunc(void* userData, const char* msg, const char* param, UInt32 line)
+ {
+-#pragma unused(userData)
+-
+ fprintf(stderr, "%s", msg);
+ if (param != 0)
+ fprintf(stderr, ": \"%s\"", param);
diff --git a/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-05-static b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-05-static
new file mode 100644
index 00000000000..04f521dcc1d
--- /dev/null
+++ b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-05-static
@@ -0,0 +1,44 @@
+ For TeX Live we build a static library and not a Dll.
+
+diff -ur TECkit-2.5.3.orig/source/Engine.cpp TECkit-2.5.3/source/Engine.cpp
+--- TECkit-2.5.3.orig/source/Engine.cpp 2012-10-13 12:30:24.000000000 +0200
++++ TECkit-2.5.3/source/Engine.cpp 2012-10-13 12:35:40.237901116 +0200
+@@ -51,12 +51,6 @@
+ # define NOSERVICE
+ # define NOMCX
+ # include <windows.h>
+-
+- BOOL WINAPI
+- DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/)
+- {
+- return true;
+- }
+ #endif
+
+ #include "Engine.h"
+diff -ur TECkit-2.5.3.orig/source/Public-headers/TECkit_Compiler.h TECkit-2.5.3/source/Public-headers/TECkit_Compiler.h
+--- TECkit-2.5.3.orig/source/Public-headers/TECkit_Compiler.h 2012-03-17 17:43:26.000000000 +0100
++++ TECkit-2.5.3/source/Public-headers/TECkit_Compiler.h 2012-10-13 12:35:40.000000000 +0200
+@@ -30,6 +30,9 @@
+ #ifdef _WIN32
+ /* MS compiler has predefined _WIN32, so assume Windows target */
+ #include <windows.h> // apparently just using windef.h fails on VC++6
++#undef WINAPI
++#define WINAPI
++#define EXPORTED
+ #else
+ /* not the MS compiler, so try Metrowerks' platform macros */
+ #ifndef __APPLE__
+diff -ur TECkit-2.5.3.orig/source/Public-headers/TECkit_Engine.h TECkit-2.5.3/source/Public-headers/TECkit_Engine.h
+--- TECkit-2.5.3.orig/source/Public-headers/TECkit_Engine.h 2011-01-13 20:38:34.000000000 +0100
++++ TECkit-2.5.3/source/Public-headers/TECkit_Engine.h 2012-10-13 12:35:40.000000000 +0200
+@@ -80,6 +80,9 @@
+ #ifdef _WIN32
+ /* MS compiler has predefined _WIN32, so assume Windows target */
+ #include <windows.h>
++#undef WINAPI
++#define WINAPI
++#define EXPORTED
+ #else
+ /* not the MS compiler, so try Metrowerks' platform macros */
+ #ifndef __APPLE__
diff --git a/Build/source/libs/teckit/TECkit-2.5.3/source/Engine.cpp b/Build/source/libs/teckit/TECkit-2.5.3/source/Engine.cpp
index 3a273d60d80..9dbf7c7399f 100644
--- a/Build/source/libs/teckit/TECkit-2.5.3/source/Engine.cpp
+++ b/Build/source/libs/teckit/TECkit-2.5.3/source/Engine.cpp
@@ -51,12 +51,6 @@ Description:
# define NOSERVICE
# define NOMCX
# include <windows.h>
-
- BOOL WINAPI
- DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/)
- {
- return true;
- }
#endif
#include "Engine.h"
@@ -102,8 +96,6 @@ READ(const UInt32 p)
#endif
}
-#pragma mark --- class Stage ---
-
Stage::Stage()
: oBuffer(0)
, oBufSize(0)
@@ -125,8 +117,6 @@ Stage::lookaheadCount() const
return 0;
}
-#pragma mark --- class Normalizer ---
-
#include "NormalizationData.c"
Normalizer::Normalizer(bool compose)
@@ -396,8 +386,6 @@ Normalizer::getChar()
return c;
}
-#pragma mark --- class Pass ---
-
Pass::Pass(const TableHeader* inTable, Converter* cnv)
: converter(cnv)
, tableHeader(inTable)
@@ -1282,8 +1270,6 @@ if (traceLevel > 0)
return 0;
}
-#pragma mark --- class Converter ---
-
Converter::Converter(const Byte* inTable, UInt32 inTableSize, bool inForward,
UInt16 inForm, UInt16 outForm)
: table(0)
@@ -1935,8 +1921,6 @@ Converter::Validate(const Converter* cnv)
return true;
}
-#pragma mark --- Public "C" API functions ---
-
TECkit_Status
WINAPI
TECkit_CreateConverter(
diff --git a/Build/source/libs/teckit/TECkit-2.5.3/source/Public-headers/TECkit_Compiler.h b/Build/source/libs/teckit/TECkit-2.5.3/source/Public-headers/TECkit_Compiler.h
index 584e950d556..9b59eb413df 100644
--- a/Build/source/libs/teckit/TECkit-2.5.3/source/Public-headers/TECkit_Compiler.h
+++ b/Build/source/libs/teckit/TECkit-2.5.3/source/Public-headers/TECkit_Compiler.h
@@ -30,6 +30,9 @@ extern "C" {
#ifdef _WIN32
/* MS compiler has predefined _WIN32, so assume Windows target */
#include <windows.h> // apparently just using windef.h fails on VC++6
+#undef WINAPI
+#define WINAPI
+#define EXPORTED
#else
/* not the MS compiler, so try Metrowerks' platform macros */
#ifndef __APPLE__
diff --git a/Build/source/libs/teckit/TECkit-2.5.3/source/Public-headers/TECkit_Engine.h b/Build/source/libs/teckit/TECkit-2.5.3/source/Public-headers/TECkit_Engine.h
index 87a3790105f..0c8cfb67dd7 100644
--- a/Build/source/libs/teckit/TECkit-2.5.3/source/Public-headers/TECkit_Engine.h
+++ b/Build/source/libs/teckit/TECkit-2.5.3/source/Public-headers/TECkit_Engine.h
@@ -80,6 +80,9 @@ extern "C" {
#ifdef _WIN32
/* MS compiler has predefined _WIN32, so assume Windows target */
#include <windows.h>
+#undef WINAPI
+#define WINAPI
+#define EXPORTED
#else
/* not the MS compiler, so try Metrowerks' platform macros */
#ifndef __APPLE__
diff --git a/Build/source/libs/teckit/TECkit-2.5.3/source/Sample-tools/TECkit_Compile.cpp b/Build/source/libs/teckit/TECkit-2.5.3/source/Sample-tools/TECkit_Compile.cpp
index e6e7af10e29..5a9467f2c8f 100644
--- a/Build/source/libs/teckit/TECkit-2.5.3/source/Sample-tools/TECkit_Compile.cpp
+++ b/Build/source/libs/teckit/TECkit-2.5.3/source/Sample-tools/TECkit_Compile.cpp
@@ -32,8 +32,6 @@ void
CALLBACK
errFunc(void* userData, const char* msg, const char* param, UInt32 line)
{
-#pragma unused(userData)
-
fprintf(stderr, "%s", msg);
if (param != 0)
fprintf(stderr, ": \"%s\"", param);