diff options
author | Matthias Andree <matthias.andree@gmx.de> | 2010-12-04 03:51:11 +0100 |
---|---|---|
committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-12-04 12:24:44 +0100 |
commit | 709271e8af5d19472cb200956bcc9b756a655f77 (patch) | |
tree | caa78971929b083a1346f09ab03731f9ed0c9e1a /service-win32/openvpnserv.c | |
parent | Prepared v2.2-beta5 for release (diff) | |
download | openvpn-709271e8af5d19472cb200956bcc9b756a655f77.tar.xz |
Change variadic macros to C99 style.
The macros used GCC's pre-C99 syntax, which could not be compiled with
Microsoft Visual Studio 2008.
Note this breaks compatibility with GCC versions before 3.0, which is
deemed safe in a discussion on IRC with David Sommerseth and Samuli
Seppänen on #openvpn-devel (RHEL 3 uses GCC 3.2 already).
Compiled tested on VS2008 by Samuli, on Cygwin GCC 3.4 and GCC 4.3 by myself.
Signed-off-by: Matthias Andree <matthias.andree@gmx.de>
Acked-by: David Sommerseth <dazo@users.sourceforge.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
(cherry picked from commit 9469168e3abb09bd78297208a917ee4d9c025041)
Diffstat (limited to '')
-rwxr-xr-x | service-win32/openvpnserv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/service-win32/openvpnserv.c b/service-win32/openvpnserv.c index 6c9ff1e..07374e2 100755 --- a/service-win32/openvpnserv.c +++ b/service-win32/openvpnserv.c @@ -84,9 +84,9 @@ static HANDLE exit_event = NULL; #define CLEAR(x) memset(&(x), 0, sizeof(x)) /* snprintf with guaranteed null termination */ -#define mysnprintf(out, args...) \ +#define mysnprintf(out, ...) \ { \ - snprintf (out, sizeof(out), args); \ + snprintf (out, sizeof(out), __VA_ARGS__); \ out [sizeof (out) - 1] = '\0'; \ } @@ -98,10 +98,10 @@ static HANDLE exit_event = NULL; #define M_ERR (MSG_FLAGS_ERROR) // error /* write error to event log */ -#define MSG(flags, args...) \ +#define MSG(flags, ...) \ { \ char x_msg[256]; \ - mysnprintf (x_msg, args); \ + mysnprintf (x_msg, __VA_ARGS__); \ AddToMessageLog ((flags), x_msg); \ } |