Add port support for unsetenv() in back branches. Needed for locale

environment fix.

diff --git a/configure b/configure
index d610e60d630a467ef7d396d00875afc239d59615..fc66ce5fac617624c75d8e09b427777f9307cce3 100755 (executable)
--- a/configure
+++ b/configure
@@ -11970,7 +11970,8 @@ fi
 
 
 
-for ac_func in crypt fseeko getopt getrusage inet_aton random rint srandom strcasecmp strdup strerror strtol strtoul
+
+for ac_func in crypt fseeko getopt getrusage inet_aton random rint srandom strcasecmp strdup strerror strtol strtoul unsetenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5

diff --git a/configure.in b/configure.in
index 51c6b7062cb861a998d93617c39752d83f5ac682..227381774d6e4561034343d7a09edd5a2c6e7f85 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -929,7 +929,7 @@ else
   AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break])
 fi
 
-AC_REPLACE_FUNCS([crypt fseeko getopt getrusage inet_aton random rint srandom strcasecmp strdup strerror strtol strtoul])
+AC_REPLACE_FUNCS([crypt fseeko getopt getrusage inet_aton random rint srandom strcasecmp strdup strerror strtol strtoul unsetenv])
 
 # system's version of getaddrinfo(), if any, may be used only if we found
 # a definition for struct addrinfo; see notes in src/include/getaddrinfo.h

diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 2276587885684b8d16515ace1d6f0e1e8821ad77..5c755038389e2acbfe3264fed849ead2bfdaecfa 100644 (file)
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -527,6 +527,9 @@
 /* Define to 1 if you have unix sockets. */
 #undef HAVE_UNIX_SOCKETS
 
+/* Define to 1 if you have the `unsetenv' function. */
+#undef HAVE_UNSETENV
+
 /* Define to 1 if you have the `utime' function. */
 #undef HAVE_UTIME
 

diff --git a/src/include/port.h b/src/include/port.h
index 20cdd8a7d916bb9f72ab7dbb0960b89952d821c9..a4e40c3184509423435f65554b20f0da74b4a399 100644 (file)
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -105,6 +105,10 @@ extern char *strdup(char const *);
 extern long random(void);
 #endif
 
+#ifndef HAVE_UNSETENV
+extern void unsetenv(const char *name);
+#endif
+
 #ifndef HAVE_SRANDOM
 extern void srandom(unsigned int seed);
 #endif