svn commit: samba r22252 - in branches/SAMBA_3_0/source/lib/replace: .

[metze at samba.org]

Author: metze
Date: 2007-04-16 09:20:52 +0000 (Mon, 16 Apr 2007)
New Revision: 22252

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22252

Log:
merge from samba4:

add prototype of setenv

metze
Modified:
   branches/SAMBA_3_0/source/lib/replace/libreplace.m4
   branches/SAMBA_3_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_3_0/source/lib/replace/libreplace.m4
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/libreplace.m4	2007-04-16 09:20:39 UTC (rev 22251)
+++ branches/SAMBA_3_0/source/lib/replace/libreplace.m4	2007-04-16 09:20:52 UTC (rev 22252)
@@ -263,7 +263,9 @@
 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)
 

Modified: branches/SAMBA_3_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/replace.h	2007-04-16 09:20:39 UTC (rev 22251)
+++ branches/SAMBA_3_0/source/lib/replace/replace.h	2007-04-16 09:20:52 UTC (rev 22252)
@@ -160,8 +160,12 @@
 
 #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
 #define unsetenv rep_unsetenv