summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-10-22 14:32:36 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-10-22 14:32:36 +0200
commit346a42383e267d087900bff7df72609c20f9ff5f (patch)
tree6865f6758920b40680d041577f6a7acdf15b4d2f
parentab9fd24fbb42c9beec763407c5a6d89b3c3f072e (diff)
fixed benchmarks build and cleanup U64 and S64 macro definition, it is now in standard (nw)
-rw-r--r--benchmarks/eminline_native.cpp2
-rw-r--r--benchmarks/eminline_noasm.cpp2
-rw-r--r--src/osd/osdcomm.h8
3 files changed, 2 insertions, 10 deletions
diff --git a/benchmarks/eminline_native.cpp b/benchmarks/eminline_native.cpp
index 9402532fddb..89c4e3f5ec3 100644
--- a/benchmarks/eminline_native.cpp
+++ b/benchmarks/eminline_native.cpp
@@ -3,7 +3,7 @@
#include "osdcore.h"
#include "eminline.h"
static void BM_count_leading_zeros_native(benchmark::State& state) {
- UINT32 cnt = 0x332533;
+ uint32_t cnt = 0x332533;
while (state.KeepRunning()) {
(void)count_leading_zeros(cnt);
cnt++;
diff --git a/benchmarks/eminline_noasm.cpp b/benchmarks/eminline_noasm.cpp
index 0344f074c01..f577154a6b7 100644
--- a/benchmarks/eminline_noasm.cpp
+++ b/benchmarks/eminline_noasm.cpp
@@ -11,7 +11,7 @@ osd_ticks_t osd_ticks(void)
#include "eminline.h"
static void BM_count_leading_zeros_noasm(benchmark::State& state) {
- UINT32 cnt = 0x332533;
+ uint32_t cnt = 0x332533;
while (state.KeepRunning()) {
(void)count_leading_zeros(cnt);
cnt++;
diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h
index 8e6ee317400..e519b597d96 100644
--- a/src/osd/osdcomm.h
+++ b/src/osd/osdcomm.h
@@ -89,21 +89,13 @@ using std::int64_t;
#define FALSE 0
#endif
-
-
/***************************************************************************
FUNDAMENTAL MACROS
***************************************************************************/
/* U64 and S64 are used to wrap long integer constants. */
-#if defined(__GNUC__) || defined(_MSC_VER)
#define U64(val) val##ULL
#define S64(val) val##LL
-#else
-#define U64(val) val
-#define S64(val) val
-#endif
-
/* Concatenate/extract 32-bit halves of 64-bit values */
constexpr uint64_t concat_64(uint32_t hi, uint32_t lo) { return (uint64_t(hi) << 32) | uint32_t(lo); }