diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh index 6a2e99011f..b2d2555276 100755 --- a/thirdparty/download-thirdparty.sh +++ b/thirdparty/download-thirdparty.sh @@ -286,6 +286,15 @@ fi cd - echo "Finished patching ${CYRUS_SASL_SOURCE}" +#patch sqltypes.h, change TCAHR to TWCHAR to avoid conflict with clucene TCAHR +cd "${TP_SOURCE_DIR}/${ODBC_SOURCE}" +if [[ ! -f ${PATCHED_MARK} ]]; then + patch -p1 <"${TP_PATCH_DIR}/sqltypes.h.patch" + touch "${PATCHED_MARK}" +fi +cd - +echo "Finished patching ${ODBC_SOURCE}" + # rocksdb patch to fix compile error if [[ "${ROCKSDB_SOURCE}" == "rocksdb-5.14.2" ]]; then cd "${TP_SOURCE_DIR}/${ROCKSDB_SOURCE}" diff --git a/thirdparty/patches/sqltypes.h.patch b/thirdparty/patches/sqltypes.h.patch new file mode 100644 index 0000000000..ad0a98084e --- /dev/null +++ b/thirdparty/patches/sqltypes.h.patch @@ -0,0 +1,28 @@ +--- a/include/sqltypes.h 2022-04-19 14:37:42.584467011 +0800 ++++ b/include/sqltypes.h 2022-04-19 13:56:41.486446873 +0800 +@@ -82,13 +82,13 @@ + * by the standard linux string header files. + */ + #ifdef SQL_WCHART_CONVERT +-typedef wchar_t TCHAR; ++typedef wchar_t TWCHAR; + #else +-typedef signed short TCHAR; ++typedef signed short TWCHAR; + #endif + + #else +-typedef char TCHAR; ++typedef char TWCHAR; + #endif + + typedef unsigned short WORD; +@@ -108,7 +108,7 @@ + typedef WCHAR* LPWSTR; + typedef const char* LPCSTR; + typedef const WCHAR* LPCWSTR; +-typedef TCHAR* LPTSTR; ++typedef TWCHAR* LPTSTR; + typedef char* LPSTR; + typedef DWORD* LPDWORD; +