From: Randall S. Becker <randall.becker@nexbridge.ca>
Date: Thu, 3 Jan 2019 21:03:51 +0000 (-0500)
Subject: compat/regex/regcomp.c: define intptr_t and uintptr_t on NonStop
X-Git-Tag: v2.21.0-rc0~90^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bdaacf66fccaebb93726d47c8bec325ec3f3b76;p=git

compat/regex/regcomp.c: define intptr_t and uintptr_t on NonStop

The system definition header files on HPE NonStop do not define
intptr_t and uintptr_t as do other platforms. These typedefs
are added specifically wrapped in a __TANDEM ifdef.

Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c
index 51cd60baa3..c0d838834a 100644
--- a/compat/regex/regcomp.c
+++ b/compat/regex/regcomp.c
@@ -17,6 +17,14 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#if defined __TANDEM
+ /* This is currently duplicated from git-compat-utils.h */
+# ifdef NO_INTPTR_T
+ typedef long intptr_t;
+ typedef unsigned long uintptr_t;
+# endif
+#endif
+
 static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
 					  size_t length, reg_syntax_t syntax);
 static void re_compile_fastmap_iter (regex_t *bufp,