diff -ur teckit-2.5.11/source/Compiler.cpp teckit-src/source/Compiler.cpp --- teckit-2.5.11/source/Compiler.cpp Thu Jul 30 04:27:12 2020 +++ teckit-src/source/Compiler.cpp Tue Nov 09 14:46:23 2021 @@ -189,7 +189,7 @@ free(table); } -char* +const char* WINAPI TECkit_GetUnicodeName(UInt32 usv) { diff -ur teckit-2.5.11/source/Compiler.h teckit-src/source/Compiler.h --- teckit-2.5.11/source/Compiler.h Thu Jul 30 04:27:12 2020 +++ teckit-src/source/Compiler.h Tue Nov 09 14:47:44 2021 @@ -229,7 +229,7 @@ vector byteClassLines; vector uniClassLines; - long passType; + UInt32 passType; UInt32 uniDefault; UInt8 byteDefault; bool supplementaryChars; diff -ur teckit-2.5.11/source/Engine.cpp teckit-src/source/Engine.cpp --- teckit-2.5.11/source/Engine.cpp Thu Jul 30 04:27:12 2020 +++ teckit-src/source/Engine.cpp Tue Nov 09 14:49:06 2021 @@ -51,12 +51,6 @@ # define NOSERVICE # define NOMCX # include - - BOOL WINAPI - DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/) - { - return true; - } #endif #include "Engine.h" diff -ur teckit-2.5.11/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h --- teckit-2.5.11/source/Public-headers/TECkit_Compiler.h Thu Jul 30 04:27:12 2020 +++ teckit-src/source/Public-headers/TECkit_Compiler.h Tue Nov 09 14:52:58 2021 @@ -29,6 +29,9 @@ #ifdef _WIN32 /* MS compiler has predefined _WIN32, so assume Windows target */ #include // 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__ @@ -55,7 +58,7 @@ #define kCompilerOpts_Compress 0x00000010 /* generate compressed mapping table */ #define kCompilerOpts_XML 0x00000020 /* instead of a compiled binary table, generate an XML representation of the mapping */ -typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, char* msg, char* param, UInt32 line); +typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, const char* msg, const char* param, UInt32 line); TECkit_Status WINAPI EXPORTED @@ -74,7 +77,7 @@ TECkit_GetCompilerVersion(); /* new APIs for looking up Unicode names (as NUL-terminated C strings) */ -char* +const char* WINAPI EXPORTED TECkit_GetUnicodeName(UInt32 usv); /* returns the Unicode name of usv, if available, else NULL */ diff -ur teckit-2.5.11/source/Public-headers/TECkit_Engine.h teckit-src/source/Public-headers/TECkit_Engine.h --- teckit-2.5.11/source/Public-headers/TECkit_Engine.h Thu Jul 30 04:27:12 2020 +++ teckit-src/source/Public-headers/TECkit_Engine.h Tue Nov 09 14:54:20 2021 @@ -79,6 +79,9 @@ #ifdef _WIN32 /* MS compiler has predefined _WIN32, so assume Windows target */ #include +#undef WINAPI +#define WINAPI +#define EXPORTED #else /* not the MS compiler, so try Metrowerks' platform macros */ #ifndef __APPLE__ diff -ur teckit-2.5.11/source/Sample-tools/TECkit_Compile.cpp teckit-src/source/Sample-tools/TECkit_Compile.cpp --- teckit-2.5.11/source/Sample-tools/TECkit_Compile.cpp Thu Jul 30 04:27:12 2020 +++ teckit-src/source/Sample-tools/TECkit_Compile.cpp Tue Nov 09 14:56:58 2021 @@ -24,13 +24,13 @@ #endif extern "C" { - static void CALLBACK errFunc(void* userData, char* msg, char* param, UInt32 line); + static void CALLBACK errFunc(void* userData, const char* msg, const char* param, UInt32 line); }; static void CALLBACK -errFunc(void* /*userData*/, char* msg, char* param, UInt32 line) +errFunc(void* /* userData */, const char* msg, const char* param, UInt32 line) { fprintf(stderr, "%s", msg); if (param != 0)