git-merge-changelog: Enable --split-merged-entry by default.

[pspp] / lib / setenv.c

diff --git a/lib/setenv.c b/lib/setenv.c
index b4c55322907ce70864434e168e407476b409c929..ee9da0d8090c02936b4f5c2a6ddc2070116a28d5 100644 (file)
--- 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