From 647cd87169d79b4ab4ad084104dc152381cca339 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sat, 7 Dec 2013 23:39:33 +0100
Subject: [PATCH] Issue #19922: define _INCLUDE__STDC_A1_SOURCE in HP-UX to
 include mbstate_t for mbrtowc().

---
 Misc/NEWS     | 3 +++
 configure     | 9 +++++++++
 configure.ac  | 7 +++++++
 pyconfig.h.in | 3 +++
 4 files changed, 22 insertions(+)

diff --git a/Misc/NEWS b/Misc/NEWS
index f623a194b58..0675cf8ee4d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -108,6 +108,9 @@ Tests
 Build
 -----
 
+- Issue #19922: define _INCLUDE__STDC_A1_SOURCE in HP-UX to include mbstate_t
+  for mbrtowc().
+
 - Issue #19788: kill_python(_d).exe is now run as a PreBuildEvent on the
   pythoncore sub-project.  This should prevent build errors due a previous
   build's python(_d).exe still running.
diff --git a/configure b/configure
index 5d666ed93eb..6bcc4b5b3e2 100755
--- a/configure
+++ b/configure
@@ -3445,6 +3445,15 @@ $as_echo "#define _POSIX_C_SOURCE 200809L" >>confdefs.h
 
 fi
 
+# On HP-UX mbstate_t requires _INCLUDE__STDC_A1_SOURCE
+case $ac_sys_system in
+hp*|HP*)
+
+$as_echo "#define _INCLUDE__STDC_A1_SOURCE 1" >>confdefs.h
+
+  ;;
+esac
+
 #
 # SGI compilers allow the specification of the both the ABI and the
 # ISA on the command line.  Depending on the values of these switches,
diff --git a/configure.ac b/configure.ac
index 14b3aef6046..2d701b1e621 100644
--- a/configure.ac
+++ b/configure.ac
@@ -522,6 +522,13 @@ then
   AC_DEFINE(_POSIX_C_SOURCE, 200809L, Define to activate features from IEEE Stds 1003.1-2008)
 fi
 
+# On HP-UX mbstate_t requires _INCLUDE__STDC_A1_SOURCE
+case $ac_sys_system in
+hp*|HP*)
+  AC_DEFINE(_INCLUDE__STDC_A1_SOURCE, 1, Define to include mbstate_t for mbrtowc)
+  ;;
+esac
+
 #
 # SGI compilers allow the specification of the both the ABI and the
 # ISA on the command line.  Depending on the values of these switches,
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 29e1bfa89af..3574f67322d 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -1382,6 +1382,9 @@
 /* Define on Linux to activate all library features */
 #undef _GNU_SOURCE
 
+/* Define to include mbstate_t for mbrtowc */
+#undef _INCLUDE__STDC_A1_SOURCE
+
 /* This must be defined on some systems to enable large file support. */
 #undef _LARGEFILE_SOURCE