Skip to content

Commit ee693dd

Browse files
committed
devkitPPC: fix regex.h for C++
1 parent ff5a6b0 commit ee693dd

1 file changed

Lines changed: 23 additions & 2 deletions

File tree

dkppc/patches/newlib-4.4.0.20231231.patch

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9322,6 +9322,19 @@ index b1dd2a7c4..16e29c037 100644
93229322
extern void *_sbrk_r (struct _reent *, ptrdiff_t);
93239323
extern int _stat_r (struct _reent *, const char *, struct stat *);
93249324
extern _CLOCK_T_ _times_r (struct _reent *, struct tms *);
9325+
diff --git a/newlib/libc/include/regex.h b/newlib/libc/include/regex.h
9326+
index fa3e26879..4da1a374e 100644
9327+
--- a/newlib/libc/include/regex.h
9328+
+++ b/newlib/libc/include/regex.h
9329+
@@ -96,7 +96,7 @@ __BEGIN_DECLS
9330+
int regcomp(regex_t *__restrict, const char *__restrict, int);
9331+
size_t regerror(int, const regex_t *__restrict, char *__restrict, size_t);
9332+
int regexec(const regex_t *__restrict, const char *__restrict,
9333+
- size_t, regmatch_t [__restrict], int);
9334+
+ size_t, regmatch_t [__restrict_arr], int);
9335+
void regfree(regex_t *);
9336+
__END_DECLS
9337+
93259338
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
93269339
index 5dcc77a80..c53fce983 100644
93279340
--- a/newlib/libc/include/sys/config.h
@@ -10107,10 +10120,18 @@ index 8664dc3e5..dbaba0264 100644
1010710120
fp->_r -= resid;
1010810121
fp->_p += resid;
1010910122
diff --git a/newlib/libc/stdio/makebuf.c b/newlib/libc/stdio/makebuf.c
10110-
index b9c75bbf8..315cd7c1a 100644
10123+
index b9c75bbf8..d748d5dc8 100644
1011110124
--- a/newlib/libc/stdio/makebuf.c
1011210125
+++ b/newlib/libc/stdio/makebuf.c
10113-
@@ -50,7 +50,7 @@ __smakebuf_r (struct _reent *ptr,
10126+
@@ -19,6 +19,7 @@
10127+
#include <_ansi.h>
10128+
#include <stdio.h>
10129+
#include <stdlib.h>
10130+
+#include <malloc.h>
10131+
#include <sys/stat.h>
10132+
#include <sys/types.h>
10133+
#include <sys/unistd.h>
10134+
@@ -50,7 +51,7 @@ __smakebuf_r (struct _reent *ptr,
1011410135
return;
1011510136
}
1011610137
flags = __swhatbuf_r (ptr, fp, &size, &couldbetty);

0 commit comments

Comments
 (0)