summaryrefslogtreecommitdiff
path: root/source4/lib/replace
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-08 16:05:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:04:00 -0500
commit4a61e4901ebc751fea57880424f9045e3bdf238e (patch)
tree98f0c68e041de8d0001a9d3dd996b0790e1473e8 /source4/lib/replace
parent69979ddc6e6a5b36f710ec6155b50c00568f68cf (diff)
downloadsamba-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/replace')
-rw-r--r--source4/lib/replace/replace.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h
index 20b73e5b84..f68c5b23a9 100644
--- a/source4/lib/replace/replace.h
+++ b/source4/lib/replace/replace.h
@@ -134,18 +134,16 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3);
#define slprintf snprintf
-#ifdef HAVE_VA_COPY
-#define VA_COPY(dest, src) va_copy(dest, src)
-#elif defined(HAVE___VA_COPY)
-#define VA_COPY(dest, src) __va_copy(dest, src)
+#ifndef HAVE_VA_COPY
+#ifdef HAVE___VA_COPY
+#define va_copy(dest, src) __va_copy(dest, src)
#else
-#define VA_COPY(dest, src) (dest) = (src)
+#define va_copy(dest, src) (dest) = (src)
+#endif
#endif
-#if defined(HAVE_VOLATILE)
-#define VOLATILE volatile
-#else
-#define VOLATILE
+#ifndef HAVE_VOLATILE
+#define volatile
#endif
#ifndef HAVE_COMPARISON_FN_T