summaryrefslogtreecommitdiff
path: root/source4/lib/util
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib/util')
-rw-r--r--source4/lib/util/dprintf.c2
-rw-r--r--source4/lib/util/select.c2
-rw-r--r--source4/lib/util/util_file.c2
-rw-r--r--source4/lib/util/xfile.c2
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;