THRIFT-1627 compiler built using compilers.vcxproj cannot be used to build some test...

Patch: Andrew Cox

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1349524 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/compiler/cpp/compiler.vcxproj b/compiler/cpp/compiler.vcxproj
index 04e108d..f46aaab 100644 (file)
--- a/compiler/cpp/compiler.vcxproj
+++ b/compiler/cpp/compiler.vcxproj
@@ -22,6 +22,7 @@
     <ClInclude Include="src\generate\t_generator.h" />
     <ClInclude Include="src\generate\t_generator_registry.h" />
     <ClInclude Include="src\generate\t_oop_generator.h" />
+    <ClInclude Include="src\generate\t_html_generator.h" />
     <ClInclude Include="src\globals.h" />
     <ClInclude Include="src\main.h" />
     <ClInclude Include="src\md5.h" />
@@ -54,6 +55,8 @@
     <ClCompile Include="src\generate\t_cpp_generator.cc" />
     <ClCompile Include="src\generate\t_csharp_generator.cc" />
     <ClCompile Include="src\generate\t_c_glib_generator.cc" />
+    <ClCompile Include="src\generate\t_d_generator.cc" />
+    <ClCompile Include="src\generate\t_delphi_generator.cc" />
     <ClCompile Include="src\generate\t_erl_generator.cc" />
     <ClCompile Include="src\generate\t_generator.cc" />
     <ClCompile Include="src\generate\t_go_generator.cc" />

diff --git a/compiler/cpp/compiler.vcxproj.filters b/compiler/cpp/compiler.vcxproj.filters
index 0720b87..6836f0d 100644 (file)
--- a/compiler/cpp/compiler.vcxproj.filters
+++ b/compiler/cpp/compiler.vcxproj.filters
@@ -10,6 +10,9 @@
     <ClInclude Include="src\generate\t_oop_generator.h">
       <Filter>generate</Filter>
     </ClInclude>
+    <ClInclude Include="src\generate\t_html_generator.h">
+      <Filter>generate</Filter>
+    </ClInclude>
     <ClInclude Include="src\globals.h" />
     <ClInclude Include="src\main.h" />
     <ClInclude Include="src\md5.h" />
@@ -103,6 +106,12 @@
     <ClCompile Include="src\generate\t_c_glib_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>
+    <ClCompile Include="src\generate\t_d_generator.cc">
+      <Filter>generate</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generate\t_delphi_generator.cc">
+      <Filter>generate</Filter>
+    </ClCompile>
     <ClCompile Include="src\generate\t_erl_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>

diff --git a/compiler/cpp/src/generate/t_delphi_generator.cc b/compiler/cpp/src/generate/t_delphi_generator.cc
index 0f83b85..469bb82 100644 (file)
--- a/compiler/cpp/src/generate/t_delphi_generator.cc
+++ b/compiler/cpp/src/generate/t_delphi_generator.cc
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sstream>
+#include <cctype>
 
 #include "platform.h"
 #include "t_oop_generator.h"

diff --git a/compiler/cpp/src/thriftl.ll b/compiler/cpp/src/thriftl.ll
index bdc41b1..00e9850 100644 (file)
--- a/compiler/cpp/src/thriftl.ll
+++ b/compiler/cpp/src/thriftl.ll
@@ -38,6 +38,7 @@
 
 #include <string>
 #include <errno.h>
+#include <stdlib.h>
 
 #include "main.h"
 #include "globals.h"

diff --git a/compiler/cpp/src/windows/config.h b/compiler/cpp/src/windows/config.h
index a69b546..9d75e80 100644 (file)
--- a/compiler/cpp/src/windows/config.h
+++ b/compiler/cpp/src/windows/config.h
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <direct.h>
 
-#define strtoll(begin_ptr, end_ptr, length) strtol(begin_ptr, end_ptr, length)
+#define strtoll(begin_ptr, end_ptr, length) _strtoi64(begin_ptr, end_ptr, length)
 
 #define PRIu64 "I64d"
 #define PRIi64 "I64d"