diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-07-19 17:39:23 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-07-19 17:39:23 +0200 |
| commit | 8557d14f65212faceb3e7223818b34b8869a0470 (patch) | |
| tree | 77979da96009cd84c850db60a1300b9956fe8587 /lib/replace | |
| parent | 7a765b65b739c38ea1e3cfc136c92d2fb5ed4fa7 (diff) | |
| parent | 4447bd96b90ce4bfca793d482f9dcbd98e6579a5 (diff) | |
| download | samba-8557d14f65212faceb3e7223818b34b8869a0470.tar.gz samba-8557d14f65212faceb3e7223818b34b8869a0470.tar.bz2 samba-8557d14f65212faceb3e7223818b34b8869a0470.zip | |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'lib/replace')
| -rw-r--r-- | lib/replace/libreplace.m4 | 1 | ||||
| -rw-r--r-- | lib/replace/replace.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4 index 2d90d9c7e8..a3a26ef43e 100644 --- a/lib/replace/libreplace.m4 +++ b/lib/replace/libreplace.m4 @@ -103,6 +103,7 @@ AC_CHECK_HEADERS(sys/time.h time.h) AC_CHECK_HEADERS(stdarg.h vararg.h) AC_CHECK_HEADERS(sys/mount.h mntent.h) AC_CHECK_HEADERS(stropts.h) +AC_CHECK_HEADERS(unix.h) AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror) AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename) diff --git a/lib/replace/replace.h b/lib/replace/replace.h index fe1f732acb..2db6aa1226 100644 --- a/lib/replace/replace.h +++ b/lib/replace/replace.h @@ -258,6 +258,10 @@ char *rep_realpath(const char *path, char *resolved_path); int rep_lchown(const char *fname,uid_t uid,gid_t gid); #endif +#ifdef HAVE_UNIX_H +#include <unix.h> +#endif + #ifndef HAVE_SETLINEBUF #define setlinebuf rep_setlinebuf void rep_setlinebuf(FILE *); |