diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2006-04-12 09:26:10 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2006-04-12 09:26:10 +0000 |
| commit | b9baa4d9ca4ae4eebe36065f9a82e39d403314cd (patch) | |
| tree | 49cce390fc41b555abbe654bfdaa6fc1cdb92eff /common.h | |
| parent | Added credit and CVE number to security vulnerability fix in 2.0.6. (diff) | |
| download | openvpn-b9baa4d9ca4ae4eebe36065f9a82e39d403314cd.tar.xz | |
svn merge -r 999:1000 $SO/trunk/openvpn .
(Fixed 64-bit counter bug on Windows)
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1002 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'common.h')
| -rw-r--r-- | common.h | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -26,9 +26,19 @@ #define COMMON_H /* - * Statistics counters. + * Statistics counters and associated printf formats. */ -typedef unsigned long long int counter_type; +#ifdef USE_64_BIT_COUNTERS + typedef unsigned long long int counter_type; +# ifdef WIN32 +# define counter_format "%I64u" +# else +# define counter_format "%llu" +# endif +#else + typedef unsigned int counter_type; +# define counter_format "%u" +#endif /* * Time intervals @@ -43,7 +53,6 @@ typedef int interval_t; /* * Printf formats for special types */ -#define counter_format "%llu" #define ptr_format "0x%08lx" #define time_format "%lu" #define fragment_header_format "0x%08x" |