diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-04-16 09:20:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:22 -0500 |
| commit | cd8f2e5c57e7917c7bd3dbd1d9a895c7c9b18556 (patch) | |
| tree | 45006ea0c146232107ece163d75bc3e8ea6c8033 | |
| parent | 4a245a15803e3df93cdb197adfc1c1046c3a8716 (diff) | |
| download | samba-cd8f2e5c57e7917c7bd3dbd1d9a895c7c9b18556.tar.gz samba-cd8f2e5c57e7917c7bd3dbd1d9a895c7c9b18556.tar.bz2 samba-cd8f2e5c57e7917c7bd3dbd1d9a895c7c9b18556.zip | |
r22252: merge from samba4:
add prototype of setenv
metze
(This used to be commit 42ccfaf5e58d92e04ba490f726e5d6972039bdc4)
| -rw-r--r-- | source3/lib/replace/libreplace.m4 | 2 | ||||
| -rw-r--r-- | source3/lib/replace/replace.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/source3/lib/replace/libreplace.m4 b/source3/lib/replace/libreplace.m4 index 33cd0894c1..ab7c83f9dd 100644 --- a/source3/lib/replace/libreplace.m4 +++ b/source3/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/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 959d44b33e..3b09216257 100644 --- a/source3/lib/replace/replace.h +++ b/source3/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 |