summaryrefslogtreecommitdiff
path: root/libc/misc/regex
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2010-01-25 06:12:08 +0100
committerCarmelo Amoroso <carmelo.amoroso@st.com>2010-01-25 06:16:56 +0100
commit74ca0c98cb8b4e6f75858ca2b2746744f2558493 (patch)
tree2999b63239b319ac416e5af7ee4a1e5a80a3ad11 /libc/misc/regex
parente64b864d6d4e020a94d3931704ccea50d1a20b82 (diff)
parentc4b750195714ec7c10aa4de15610c5aae0751c1c (diff)
Merge branch 'master' into nptl
Conflicts: libc/inet/Makefile.in libc/inet/hostid.c Synchronise nptl branch with master branch @ c4b750195714ec7c10aa4de15610c5aae0751c1c Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libc/misc/regex')
-rw-r--r--libc/misc/regex/regex_old.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c
index cbfb7ae7c..bc2ad6cb8 100644
--- a/libc/misc/regex/regex_old.c
+++ b/libc/misc/regex/regex_old.c
@@ -8140,7 +8140,7 @@ libc_hidden_def(regexec)
size_t
regerror (
int errcode,
- const regex_t *preg,
+ const regex_t * preg attribute_unused,
char *errbuf,
size_t errbuf_size)
{