r22252: merge from samba4:

add prototype of setenv

metze

diff --git a/source/lib/replace/libreplace.m4 b/source/lib/replace/libreplace.m4
index 33cd0894c1077bb530b74f73b6c6c47ede5f8a85..ab7c83f9dd46831e5d04561c32133d40691998e7 100644 (file)
--- a/source/lib/replace/libreplace.m4
+++ b/source/lib/replace/libreplace.m4
@@ -263,7 +263,9 @@ AC_CHECK_HEADERS([sys/param.h limits.h])
 AC_CHECK_TYPE(comparison_fn_t, 
 [AC_DEFINE(HAVE_COMPARISON_FN_T, 1,[Whether or not we have comparison_fn_t])])
 
+AC_CHECK_DECLS([setenv, unsetenv])
 AC_CHECK_FUNCS(setenv unsetenv)
+
 AC_CHECK_FUNCS(strnlen)
 AC_CHECK_FUNCS(strtoull __strtoull strtouq strtoll __strtoll strtoq)
 

diff --git a/source/lib/replace/replace.h b/source/lib/replace/replace.h
index 959d44b33e75a778c2b35b3254e3b0380151419b..3b09216257f78c3ca471a84b96ede1248125e579 100644 (file)
--- a/source/lib/replace/replace.h
+++ b/source/lib/replace/replace.h
@@ -160,7 +160,11 @@ size_t rep_strnlen(const char *s, size_t n);
 
 #ifndef HAVE_SETENV
 #define setenv rep_setenv
-int rep_setenv(const char *name, const char *value, int overwrite); 
+int rep_setenv(const char *name, const char *value, int overwrite);
+#else
+#ifndef HAVE_DECL_SETENV
+int setenv(const char *name, const char *value, int overwrite);
+#endif
 #endif
 
 #ifndef HAVE_UNSETENV