diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-12-27 18:25:47 +0100 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-12-27 18:25:47 +0100 |
| commit | 79f3537f69e125f19f59c36aa090120a63186a54 (patch) | |
| tree | 2089a3b7dac990841dbc2e4d9b2f535b82dbb0af /src/openvpn/common.h | |
| parent | f2137fedb30cb87448eb03b2f288920df6187571 (diff) | |
| parent | 3a2bbdb05ca6a6996e424c9fb225cb0d53804125 (diff) | |
Merge tag 'upstream/2.4.0'
Upstream version 2.4.0
Diffstat (limited to 'src/openvpn/common.h')
| -rw-r--r-- | src/openvpn/common.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/openvpn/common.h b/src/openvpn/common.h index 1134101..cd988d4 100644 --- a/src/openvpn/common.h +++ b/src/openvpn/common.h @@ -5,7 +5,7 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net> + * Copyright (C) 2002-2017 OpenVPN Technologies, Inc. <sales@openvpn.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 @@ -29,15 +29,15 @@ * Statistics counters and associated printf formats. */ #ifdef USE_64_BIT_COUNTERS - typedef unsigned long long int counter_type; -# ifdef _WIN32 -# define counter_format "%I64u" -# else -# define counter_format "%llu" -# endif +typedef unsigned long long int counter_type; +#ifdef _WIN32 +#define counter_format "%I64u" #else - typedef unsigned int counter_type; -# define counter_format "%u" +#define counter_format "%llu" +#endif +#else /* ifdef USE_64_BIT_COUNTERS */ +typedef unsigned int counter_type; +#define counter_format "%u" #endif /* @@ -102,4 +102,4 @@ typedef unsigned long ptr_type; */ #define SCRIPT_SECURITY_WARNING "WARNING: External program may not be called unless '--script-security 2' or higher is enabled. See --help text or man page for detailed info." -#endif +#endif /* ifndef COMMON_H */ |