[PATCH 3/3] setenv: allow compilation with C++

[Eric Blake]

* lib/setenv.c (__add_to_environ): Add a cast.  Also, drop use of
register keyword.

Signed-off-by: Eric Blake <ebl...@redhat.com>
---
 ChangeLog    |    4 ++++
 lib/setenv.c |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2a3f017..2360f0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-04-16  Eric Blake  <ebl...@redhat.com>

+       setenv: allow compilation with C++
+       * lib/setenv.c (__add_to_environ): Add a cast.  Also, drop use of
+       register keyword.
+
        stdint: allow test to pass with C++
        * tests/test-stdint.c: Define __STDC_CONSTANT_MACROS, for glibc.

diff --git a/lib/setenv.c b/lib/setenv.c
index b4c5532..ee9da0d 100644
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -112,8 +112,8 @@ int
 __add_to_environ (const char *name, const char *value, const char *combined,
                   int replace)
 {
-  register char **ep;
-  register size_t size;
+  char **ep;
+  size_t size;
   const size_t namelen = strlen (name);
   const size_t vallen = value != NULL ? strlen (value) + 1 : 0;

@@ -249,7 +249,7 @@ __add_to_environ (const char *name, const char *value, 
const char *combined,
           if (np == NULL)
 #endif
             {
-              np = malloc (namelen + 1 + vallen);
+              np = (char *) malloc (namelen + 1 + vallen);
               if (np == NULL)
                 {
 #if defined USE_TSEARCH && !defined _LIBC
-- 
1.6.6.1