github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-04-29 14:30:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into time_simple

Browse Source
This commit is contained in:
dominic 2023-10-17 16:50:55 +01:00 committed by GitHub
commit 9ae06a3b6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

3
.github/workflows/clang-format-lint.yml vendored
View File

@ -4,7 +4,8 @@ on:
pull_request: {}
jobs:
build:
job:
name: check-clang-format
runs-on: ubuntu-latest
steps:

2
src/sysinfo.cc
View File

@ -18,7 +18,7 @@
#if !defined(WINVER) || WINVER < 0x0600
#undef WINVER
#define WINVER 0x0600
#endif // WINVER handling
#endif // WINVER handling
#include <shlwapi.h>
#undef StrCat // Don't let StrCat in string_util.h be renamed to lstrcatA
#include <versionhelpers.h>