diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-08 16:05:21 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:04:00 -0500 |
| commit | 4a61e4901ebc751fea57880424f9045e3bdf238e (patch) | |
| tree | 98f0c68e041de8d0001a9d3dd996b0790e1473e8 /source4/lib/util | |
| parent | 69979ddc6e6a5b36f710ec6155b50c00568f68cf (diff) | |
| download | samba-4a61e4901ebc751fea57880424f9045e3bdf238e.tar.gz samba-4a61e4901ebc751fea57880424f9045e3bdf238e.tar.bz2 samba-4a61e4901ebc751fea57880424f9045e3bdf238e.zip | |
r14999: Remove more unused autoconf code
Simplify va_copy() replacement code a bit
(This used to be commit a5c87360a7f14a90b831ea372277f4f89ee4c5f1)
Diffstat (limited to 'source4/lib/util')
| -rw-r--r-- | source4/lib/util/dprintf.c | 2 | ||||
| -rw-r--r-- | source4/lib/util/select.c | 2 | ||||
| -rw-r--r-- | source4/lib/util/util_file.c | 2 | ||||
| -rw-r--r-- | source4/lib/util/xfile.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/util/dprintf.c b/source4/lib/util/dprintf.c index 916db3af93..62dc2a227a 100644 --- a/source4/lib/util/dprintf.c +++ b/source4/lib/util/dprintf.c @@ -38,7 +38,7 @@ _PUBLIC_ int d_vfprintf(FILE *f, const char *format, va_list ap) _PRINTF_ATTRIBU va_list ap2; /* do any message translations */ - VA_COPY(ap2, ap); + va_copy(ap2, ap); ret = vasprintf(&p, format, ap2); diff --git a/source4/lib/util/select.c b/source4/lib/util/select.c index a1b2e04065..4f906f2454 100644 --- a/source4/lib/util/select.c +++ b/source4/lib/util/select.c @@ -32,7 +32,7 @@ static pid_t initialised; static int select_pipe[2]; -static VOLATILE unsigned pipe_written, pipe_read; +static volatile unsigned pipe_written, pipe_read; /******************************************************************* Call this from all Samba signal handlers if you want to avoid a diff --git a/source4/lib/util/util_file.c b/source4/lib/util/util_file.c index 3f6a6b3a40..8d8e7c6ec9 100644 --- a/source4/lib/util/util_file.c +++ b/source4/lib/util/util_file.c @@ -371,7 +371,7 @@ _PUBLIC_ int vfdprintf(int fd, const char *format, va_list ap) _PRINTF_ATTRIBUTE int len, ret; va_list ap2; - VA_COPY(ap2, ap); + va_copy(ap2, ap); len = vasprintf(&p, format, ap2); if (len <= 0) return len; diff --git a/source4/lib/util/xfile.c b/source4/lib/util/xfile.c index 97bab2ef9a..1cf77a3220 100644 --- a/source4/lib/util/xfile.c +++ b/source4/lib/util/xfile.c @@ -202,7 +202,7 @@ size_t x_fwrite(const void *p, size_t size, size_t nmemb, XFILE *f) int len, ret; va_list ap2; - VA_COPY(ap2, ap); + va_copy(ap2, ap); len = vasprintf(&p, format, ap2); if (len <= 0) return len; |