From 712ab775a4e5206460011bf428442b69aa04b426 Mon Sep 17 00:00:00 2001
From: Chris Bartak <Chris Bartak>
Date: Mon, 4 Jun 2018 19:59:59 -0500
Subject: [PATCH 1/3] BLD: static link c++ runtime on Windows

---
 doc/source/whatsnew/v0.23.1.txt | 1 +
 setup.py                        | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/source/whatsnew/v0.23.1.txt b/doc/source/whatsnew/v0.23.1.txt
index e27c5d172f0c8..7e8b71d58d212 100644
--- a/doc/source/whatsnew/v0.23.1.txt
+++ b/doc/source/whatsnew/v0.23.1.txt
@@ -113,3 +113,4 @@ Other
 
 - Tab completion on :class:`Index` in IPython no longer outputs deprecation warnings (:issue:`21125`)
 - Bug preventing pandas from being importable with -OO optimization (:issue:`21071`)
+- Bug preventing pandas being used on Windows without C++ redistributable installed (:issue:`21106`)
diff --git a/setup.py b/setup.py
index 6febe674fb2a1..a869e73eb1414 100755
--- a/setup.py
+++ b/setup.py
@@ -453,10 +453,11 @@ def pxd(name):
     return pjoin('pandas', name + '.pxd')
 
 
-# args to ignore warnings
 if is_platform_windows():
-    extra_compile_args = []
+    # static link c++ runtime
+    extra_compile_args = ['/MT']
 else:
+    # args to ignore warnings
     extra_compile_args = ['-Wno-unused-function']
 
 lib_depends = lib_depends + ['pandas/_libs/src/numpy_helper.h',

From d9fe49fc434a6289adb55d2bf93faed26c0bdeba Mon Sep 17 00:00:00 2001
From: Chris Bartak <Chris Bartak>
Date: Tue, 5 Jun 2018 19:11:41 -0500
Subject: [PATCH 2/3] revert /MT and include dll in package_data

---
 setup.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index a869e73eb1414..90ec8e91a0700 100755
--- a/setup.py
+++ b/setup.py
@@ -454,8 +454,7 @@ def pxd(name):
 
 
 if is_platform_windows():
-    # static link c++ runtime
-    extra_compile_args = ['/MT']
+    extra_compile_args = []
 else:
     # args to ignore warnings
     extra_compile_args = ['-Wno-unused-function']
@@ -734,7 +733,7 @@ def pxd(name):
       maintainer=AUTHOR,
       version=versioneer.get_version(),
       packages=find_packages(include=['pandas', 'pandas.*']),
-      package_data={'': ['data/*', 'templates/*'],
+      package_data={'': ['data/*', 'templates/*', '_libs/*.dll'],
                     'pandas.tests.io': ['data/legacy_hdf/*.h5',
                                         'data/legacy_pickle/*/*.pickle',
                                         'data/legacy_msgpack/*/*.msgpack',

From 7845eb2b918f6b6d625fe80fcbf03f9c07bc84db Mon Sep 17 00:00:00 2001
From: Chris Bartak <chris.bartak@advisorsexcel.com>
Date: Fri, 8 Jun 2018 12:31:13 -0500
Subject: [PATCH 3/3] rebase fixup

---
 doc/source/whatsnew/v0.23.1.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/source/whatsnew/v0.23.1.txt b/doc/source/whatsnew/v0.23.1.txt
index 37866619dc1f9..18004be2b6b5f 100644
--- a/doc/source/whatsnew/v0.23.1.txt
+++ b/doc/source/whatsnew/v0.23.1.txt
@@ -132,5 +132,4 @@ Bug Fixes
 **Other**
 
 - Tab completion on :class:`Index` in IPython no longer outputs deprecation warnings (:issue:`21125`)
-- Bug preventing pandas from being importable with -OO optimization (:issue:`21071`)
 - Bug preventing pandas being used on Windows without C++ redistributable installed (:issue:`21106`)