Also change the types to use C99 uint64_t and its printf u64 define.
Signed-off-by: Arne Schwabe <a...@rfc2549.org>
---
src/openvpn/common.h | 15 +++------------
src/openvpn/syshead.h | 5 -----
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/src/openvpn/common.h b/src/openvpn/common.h
index 623b3e0d7..544fa238e 100644
--- a/src/openvpn/common.h
+++ b/src/openvpn/common.h
@@ -25,19 +25,10 @@
#define COMMON_H
/*
- * Statistics counters and associated printf formats.
+ * Statistics counters and associated printf format.
*/
-#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 /* ifdef USE_64_BIT_COUNTERS */
-typedef unsigned int counter_type;
-#define counter_format "%u"
-#endif
+typedef uint64_t counter_type;
+#define counter_format "%" PRIu64
/*
* Time intervals
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index cb9bf7dc7..f29c63c73 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -458,11 +458,6 @@ socket_defined(const socket_descriptor_t sd)
return sd != SOCKET_UNDEFINED;
}
-/*
- * Should statistics counters be 64 bits?
- */
-#define USE_64_BIT_COUNTERS
-
/*
* Should we enable the use of execve() for calling subprocesses,
* instead of system()?
--
2.31.1
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
