summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/pexecute.c4
-rw-r--r--libiberty/regex.c2
3 files changed, 8 insertions, 3 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index dc55ff2e546..bb111110786 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-12 Ben Elliston <bje@au.ibm.com>
+
+ * pexecute.c (pexecute): Cast string litrals to char *.
+ * regex.c (re_comp): Cast a call to gettext() to char *.
+
2005-07-07 Kelley Cook <kcook@gcc.gnu.org>
* config.table: Delete file. Move former contents into ...
diff --git a/libiberty/pexecute.c b/libiberty/pexecute.c
index 60a280b8e47..cce6e300c5d 100644
--- a/libiberty/pexecute.c
+++ b/libiberty/pexecute.c
@@ -47,7 +47,7 @@ pexecute (const char *program, char * const *argv, const char *pname,
{
if (pex != NULL)
{
- *errmsg_fmt = "pexecute already in progress";
+ *errmsg_fmt = (char *) "pexecute already in progress";
*errmsg_arg = NULL;
return -1;
}
@@ -58,7 +58,7 @@ pexecute (const char *program, char * const *argv, const char *pname,
{
if (pex == NULL)
{
- *errmsg_fmt = "pexecute not in progress";
+ *errmsg_fmt = (char *) "pexecute not in progress";
*errmsg_arg = NULL;
return -1;
}
diff --git a/libiberty/regex.c b/libiberty/regex.c
index 9d3e532a598..b7be99d25b2 100644
--- a/libiberty/regex.c
+++ b/libiberty/regex.c
@@ -7814,7 +7814,7 @@ re_comp (const char *s)
if (!s)
{
if (!re_comp_buf.buffer)
- return gettext ("No previous regular expression");
+ return (char *) gettext ("No previous regular expression");
return 0;
}