diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-17 12:08:15 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-18 14:15:33 +0200 |
| commit | 842ea427bc012a6f26f2d968e8174d8c7ee26aef (patch) | |
| tree | 48779e9edbf998cec21af447038489a288331bbd | |
| parent | 4083247a480e721bd041703e25cd2966a76d1196 (diff) | |
| download | samba-842ea427bc012a6f26f2d968e8174d8c7ee26aef.tar.gz samba-842ea427bc012a6f26f2d968e8174d8c7ee26aef.tar.bz2 samba-842ea427bc012a6f26f2d968e8174d8c7ee26aef.zip | |
Use standard va_copy.
| -rw-r--r-- | source3/lib/dprintf.c | 2 | ||||
| -rw-r--r-- | source3/lib/util.c | 2 | ||||
| -rw-r--r-- | source3/samba4.m4 | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/source3/lib/dprintf.c b/source3/lib/dprintf.c index a3bb5be43a..b3c830dd5b 100644 --- a/source3/lib/dprintf.c +++ b/source3/lib/dprintf.c @@ -41,7 +41,7 @@ msgstr = lang_msg(format); if (!msgstr) return -1; - VA_COPY(ap2, ap); + va_copy(ap2, ap); ret = vasprintf(&p, msgstr, ap2); diff --git a/source3/lib/util.c b/source3/lib/util.c index 418ae41392..8c2b3feeca 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -2565,7 +2565,7 @@ char *smb_xstrndup(const char *s, size_t n) int n; va_list ap2; - VA_COPY(ap2, ap); + va_copy(ap2, ap); n = vasprintf(ptr, format, ap2); if (n == -1 || ! *ptr) { diff --git a/source3/samba4.m4 b/source3/samba4.m4 index a5b7da7e07..05d655217f 100644 --- a/source3/samba4.m4 +++ b/source3/samba4.m4 @@ -37,7 +37,13 @@ m4_include(lib/charset/config.m4) m4_include(lib/socket/config.m4) m4_include(nsswitch/nsstest.m4) m4_include(../pidl/config.m4) -m4_include(lib/zlib.m4) +m4_include(../lib/zlib/zlib.m4) +AC_ZLIB([ +SMB_EXT_LIB(ZLIB, [${ZLIB_LIBS}]) +],[ +SMB_INCLUDE_MK(lib/zlib.mk) +]) + AC_CONFIG_FILES(../source4/lib/registry/registry.pc) AC_CONFIG_FILES(../source4/librpc/dcerpc.pc) |