From f47c1ff78da6d755e6fc16526731bc00e6566fa0 Mon Sep 17 00:00:00 2001
From: Matthew Newhook <matthew@zeroc.com>
Date: Wed, 18 Feb 2015 16:13:32 -0330
Subject: Fix windows build issues.

---
 cpp/src/Slice/Makefile.mak | 2 --
 cpp/src/Slice/Python.cpp   | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak
index 35418099782..050a990e3de 100644
--- a/cpp/src/Slice/Makefile.mak
+++ b/cpp/src/Slice/Makefile.mak
@@ -33,8 +33,6 @@ OBJS		= .\Checksum.obj \
 		  .\RubyUtil.obj \
 		  .\Util.obj \
 		  .\Ruby.obj \
-		  .\Scanner.obj \
-		  .\Util.obj
                   $(BISON_FLEX_OBJS)
 
 !include $(top_srcdir)/config/Make.rules.mak
diff --git a/cpp/src/Slice/Python.cpp b/cpp/src/Slice/Python.cpp
index a14dcd4a5a2..75b118d2eef 100644
--- a/cpp/src/Slice/Python.cpp
+++ b/cpp/src/Slice/Python.cpp
@@ -14,6 +14,8 @@
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
+// BUGFIX: With MSVC2013 if this isn't included you get strange linker errors.
+#include <IceUtil/FileUtil.h>
 #include <Slice/Preprocessor.h>
 #include <Slice/FileTracker.h>
 #include <Slice/PythonUtil.h>
-- 
cgit v1.2.3