commit f7a8d946a0b22d0acce1325d2607c38597b36a58
author Nobuaki Sukegawa <nsuke@apache.org> Tue Mar 01 01:41:47 2016 +0900
committer Nobuaki Sukegawa <nsuke@apache.org> Wed Mar 02 23:44:23 2016 +0900
tree 281b6db3dfea2ec5552198ed8e51dac52ca66415
parent 3dd4d8eca8c1d20819fb58fa863b83bd348cf411

THRIFT-3699 Fix integer limit symbol includes in Python C extension

This closes #915

lib/py/src/ext/module.cpp

diff --git a/lib/py/src/ext/module.cpp b/lib/py/src/ext/module.cpp
index 5ffc155..34ec7f6 100644
--- a/lib/py/src/ext/module.cpp
+++ b/lib/py/src/ext/module.cpp
@@ -21,8 +21,8 @@
 #include "types.h"
 #include "binary.h"
 #include "compact.h"
+#include <limits>
 #include <stdint.h>
-#include <sys/resource.h>
 
 // TODO(dreiss): defval appears to be unused.  Look into removing it.
 // TODO(dreiss): Make parse_spec_args recursive, and cache the output
@@ -87,11 +87,18 @@
   }
 
   T protocol;
+#ifdef _MSC_VER
+  // workaround strange VC++ 2015 bug where #else path does not compile
+  int32_t default_limit = INT32_MAX;
+#else
+  int32_t default_limit = std::numeric_limits<int32_t>::max();
+#endif
   protocol.setStringLengthLimit(
-      as_long_then_delete(PyObject_GetAttr(oprot, INTERN_STRING(string_length_limit)), INT32_MAX));
+      as_long_then_delete(PyObject_GetAttr(oprot, INTERN_STRING(string_length_limit)),
+                          default_limit));
   protocol.setContainerLengthLimit(
       as_long_then_delete(PyObject_GetAttr(oprot, INTERN_STRING(container_length_limit)),
-                          INT32_MAX));
+                          default_limit));
   ScopedPyObject transport(PyObject_GetAttr(oprot, INTERN_STRING(trans)));
   if (!transport) {
     return NULL;
@@ -170,21 +177,6 @@
 
 #endif
 
-  const rlim_t kStackSize = 16 * 1024 * 1024; // min stack size = 16 MB
-  struct rlimit rl;
-  int result;
-
-  result = getrlimit(RLIMIT_STACK, &rl);
-  if (result == 0) {
-    if (rl.rlim_cur < kStackSize) {
-      rl.rlim_cur = kStackSize;
-      result = setrlimit(RLIMIT_STACK, &rl);
-      if (result != 0) {
-        fprintf(stderr, "setrlimit returned result = %d\n", result);
-      }
-    }
-  }
-
 #define INIT_INTERN_STRING(value)                                                                  \
   do {                                                                                             \
     INTERN_STRING(value) = PyString_InternFromString(#value);                                      \