diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-19 00:49:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-19 00:49:54 +0300 |
| commit | 9f2eba2b90d7af573e1a86c6974db4fe33acbfe1 (patch) | |
| tree | 64c43292005b34ada96172f1f47ccb7dc5549bd8 /compat | |
| parent | e805dc189218a6e7b4a735c90ec687a4ca174a85 (diff) | |
| parent | 0bdaacf66fccaebb93726d47c8bec325ec3f3b76 (diff) | |
Merge branch 'rb/hpe'
Portability updates for the HPE NonStop platform.
* rb/hpe:
compat/regex/regcomp.c: define intptr_t and uintptr_t on NonStop
git-compat-util.h: add FLOSS headers for HPE NonStop
config.mak.uname: support for modern HPE NonStop config.
transport-helper: drop read/write errno checks
transport-helper: use xread instead of read
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/regex/regcomp.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c index 51cd60baa37..c0d838834ad 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, |