--- a/components/python/python27/Makefile	Tue Sep 13 17:39:13 2016 -0700
+++ b/components/python/python27/Makefile	Fri Sep 02 15:59:28 2016 -0700
@@ -52,7 +52,9 @@
 # We patch auto* files, so regenerate headers and configure
 COMPONENT_PREP_ACTION = (cd $(@D) ; autoheader ; autoconf -f)
 
-C99MODE=
+studio_C99MODE= $(studio_C99_ENABLE)
+CFLAGS += $(XPG6MODE)
+
 CPPFLAGS +=	-IPython
 
 # to find the ncurses headers

--- a/components/python/python27/patches/07-dlpi.patch	Tue Sep 13 17:39:13 2016 -0700
+++ b/components/python/python27/patches/07-dlpi.patch	Fri Sep 02 15:59:28 2016 -0700
@@ -1128,14 +1128,14 @@
 +	PyObject *list = (PyObject *)arg;
 +
 +	if ((list == NULL) || !PyList_Check(list))
-+		return (B_FALSE);
++		return (_B_FALSE);
 +
 +	linkname = Py_BuildValue("s", name);
 +	if (PyList_Append(list, linkname) == -1)
-+		return (B_TRUE);
++		return (_B_TRUE);
 +
 +	Py_DECREF(linkname);
-+	return (B_FALSE);
++	return (_B_FALSE);
 +}
 +
 +PyDoc_STRVAR(listlink_doc,

--- a/components/python/python34/Makefile	Tue Sep 13 17:39:13 2016 -0700
+++ b/components/python/python34/Makefile	Fri Sep 02 15:59:28 2016 -0700
@@ -58,7 +58,9 @@
 # python-config
 CC +=	$(CFLAGS)
 
-C99MODE=
+studio_C99MODE= $(studio_C99_ENABLE)
+CFLAGS += $(XPG6MODE)
+
 CPPFLAGS +=	-IPython
 
 # to find the ncurses headers

--- a/components/python/python34/patches/06-solaris-64-bit.patch	Tue Sep 13 17:39:13 2016 -0700
+++ b/components/python/python34/patches/06-solaris-64-bit.patch	Fri Sep 02 15:59:28 2016 -0700
@@ -179,7 +179,7 @@
      wchar_t argv0_path[MAXPATHLEN+1];
      wchar_t zip_path[MAXPATHLEN+1];
      int pfound, efound; /* 1 if found; -1 if found build directory */
-+    boolean_t added_64 = B_FALSE;
++    boolean_t added_64 = _B_FALSE;
      wchar_t *buf;
      size_t bufsz;
      size_t prefixsz;
@@ -189,7 +189,7 @@
      }
 +    if (sizeof(void *) == 8 && wcslen(exec_prefix) + 3 <= MAXPATHLEN) {
 +        wcscat(exec_prefix, L"/64");
-+        added_64 = B_TRUE;
++        added_64 = _B_TRUE;
 +    }
 +
      /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */

--- a/components/python/python34/patches/08-dlpi.patch	Tue Sep 13 17:39:13 2016 -0700
+++ b/components/python/python34/patches/08-dlpi.patch	Fri Sep 02 15:59:28 2016 -0700
@@ -1128,14 +1128,14 @@
 +	PyObject *list = (PyObject *)arg;
 +
 +	if ((list == NULL) || !PyList_Check(list))
-+		return (B_FALSE);
++		return (_B_FALSE);
 +
 +	linkname = Py_BuildValue("s", name);
 +	if (PyList_Append(list, linkname) == -1)
-+		return (B_TRUE);
++		return (_B_TRUE);
 +
 +	Py_DECREF(linkname);
-+	return (B_FALSE);
++	return (_B_FALSE);
 +}
 +
 +PyDoc_STRVAR(listlink_doc,

--- a/components/python/python35/Makefile	Tue Sep 13 17:39:13 2016 -0700
+++ b/components/python/python35/Makefile	Fri Sep 02 15:59:28 2016 -0700
@@ -58,7 +58,9 @@
 # python-config
 CC +=	$(CFLAGS)
 
-C99MODE=
+studio_C99MODE= $(studio_C99_ENABLE)
+CFLAGS += $(XPG6MODE)
+
 CPPFLAGS +=	-IPython
 
 # to find the ncurses headers

--- a/components/python/python35/patches/08-dlpi.patch	Tue Sep 13 17:39:13 2016 -0700
+++ b/components/python/python35/patches/08-dlpi.patch	Fri Sep 02 15:59:28 2016 -0700
@@ -1128,14 +1128,14 @@
 +	PyObject *list = (PyObject *)arg;
 +
 +	if ((list == NULL) || !PyList_Check(list))
-+		return (B_FALSE);
++		return (_B_FALSE);
 +
 +	linkname = Py_BuildValue("s", name);
 +	if (PyList_Append(list, linkname) == -1)
-+		return (B_TRUE);
++		return (_B_TRUE);
 +
 +	Py_DECREF(linkname);
-+	return (B_FALSE);
++	return (_B_FALSE);
 +}
 +
 +PyDoc_STRVAR(listlink_doc,