Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
diff --git a/compiler/cpp/README_Windows.txt b/compiler/cpp/README_Windows.txt
index 438ce04..a19f83d 100644
--- a/compiler/cpp/README_Windows.txt
+++ b/compiler/cpp/README_Windows.txt
@@ -24,6 +24,10 @@
> bison -y -o "src/thrifty.cc" --defines src/thrifty.yy
> move src\thrifty.cc.hh src\thrifty.hh
+Bison might generate the yacc header file "thrifty.cc.h" with just one h ".h" extension; in this case you'll have to rename to "thrifty.h".
+
+> move src\windows\version.h.in src\windows\version.h
+
Download inttypes.h from the interwebs and place it in an include path
location (e.g. thrift/compiler/cpp/src).
diff --git a/lib/cpp/src/thrift/windows/StdAfx.cpp b/lib/cpp/src/thrift/windows/StdAfx.cpp
deleted file mode 100644
index e69de29..0000000
--- a/lib/cpp/src/thrift/windows/StdAfx.cpp
+++ /dev/null
diff --git a/lib/cpp/src/thrift/windows/StdAfx.h b/lib/cpp/src/thrift/windows/StdAfx.h
deleted file mode 100644
index e69de29..0000000
--- a/lib/cpp/src/thrift/windows/StdAfx.h
+++ /dev/null
diff --git a/lib/cpp/src/thrift/windows/TargetVersion.h b/lib/cpp/src/thrift/windows/TargetVersion.h
deleted file mode 100644
index e69de29..0000000
--- a/lib/cpp/src/thrift/windows/TargetVersion.h
+++ /dev/null
diff --git a/lib/cpp/src/thrift/windows/force_inc.h b/lib/cpp/src/thrift/windows/force_inc.h
deleted file mode 100644
index e69de29..0000000
--- a/lib/cpp/src/thrift/windows/force_inc.h
+++ /dev/null
diff --git a/lib/cpp/src/thrift/windows/tr1/functional b/lib/cpp/src/thrift/windows/tr1/functional
deleted file mode 100644
index e69de29..0000000
--- a/lib/cpp/src/thrift/windows/tr1/functional
+++ /dev/null