Portability: Don't assume unsetenv has a non-void return type

diff --git a/ccache.h b/ccache.h
index 53788e52fe3fa6bde599048387f0cefabd70e04f..7e258834fd8f03a8a855538b8a6fdd18fc22d53c 100644 (file)
--- a/ccache.h
+++ b/ccache.h
@@ -123,7 +123,7 @@ char *x_strndup(const char *s, size_t n);
 void *x_malloc(size_t size);
 void *x_calloc(size_t nmemb, size_t size);
 void *x_realloc(void *ptr, size_t size);
-int x_unsetenv(const char *name);
+void x_unsetenv(const char *name);
 void traverse(const char *dir, void (*fn)(const char *, struct stat *));
 char *basename(const char *path);
 char *dirname(const char *path);

diff --git a/util.c b/util.c
index 1d473ac5e51c0ecadffbd6dcb4c1facec92071ec..ed884d100b0f985b36493bcf33a3aac63bdbb8d2 100644 (file)
--- a/util.c
+++ b/util.c
@@ -680,12 +680,12 @@ x_realloc(void *ptr, size_t size)
 }
 
 /* This is like unsetenv. */
-int x_unsetenv(const char *name)
+void x_unsetenv(const char *name)
 {
 #ifdef HAVE_UNSETENV
-       return unsetenv(name);
+       unsetenv(name);
 #else
-       return putenv(x_strdup(name)); /* Leak to environment. */
+       putenv(x_strdup(name)); /* Leak to environment. */
 #endif
 }