Merge [TRAFODION-3222] PR 1727 Fix Windows ODBC build on release2.3 branch
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/d4e60e08 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/d4e60e08 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/d4e60e08 Branch: refs/heads/release2.3 Commit: d4e60e08ca0c2cc219a1661afd4b94bc6159f0a3 Parents: f7ac169 a75bf06 Author: Dave Birdsall <dbirds...@apache.org> Authored: Thu Oct 18 16:59:59 2018 +0000 Committer: Dave Birdsall <dbirds...@apache.org> Committed: Thu Oct 18 16:59:59 2018 +0000 ---------------------------------------------------------------------- core/conn/odb/build.bat | 4 ++-- core/conn/odb/installer.iss | 6 +++--- win-odbc64/Install/win64_installer/installer.iss | 8 ++++---- win-odbc64/odbcclient/DSNConverter/DSNConverter.def | 2 +- win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc | 10 +++++----- win-odbc64/odbcclient/Drvr35Res/Drvr35Res_os.vcxproj | 6 +++--- win-odbc64/odbcclient/TranslationDll/TranslationDll.def | 2 +- win-odbc64/odbcclient/TranslationDll/TranslationDll.rc | 10 +++++----- .../odbcclient/TranslationDll/TranslationDll_os.vcxproj | 8 ++++---- win-odbc64/odbcclient/build_os.bat | 4 ++-- win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC | 10 +++++----- win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4_os.vcxproj | 8 ++++---- win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC | 10 +++++----- win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6_os.vcxproj | 8 ++++---- win-odbc64/odbcclient/drvr35/cdatasource.cpp | 2 +- win-odbc64/odbcclient/drvr35/drvr35.rc | 10 +++++----- win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj | 6 +++--- win-odbc64/odbcclient/drvr35/sqltocconv.h | 1 + win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj | 10 +++++----- win-odbc64/odbcclient/drvr35adm/drvr35adm.h | 2 +- win-odbc64/odbcclient/drvr35adm/drvr35adm.rc | 10 +++++----- win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc | 10 +++++----- win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj | 6 +++--- win-odbc64/odbcclient/odbcclient_os.sln | 6 +++--- 24 files changed, 80 insertions(+), 79 deletions(-) ----------------------------------------------------------------------