Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit be34777

Browse filesBrowse files
zcbenzdanielleadams
zcbenz
authored and
danielleadams
committed
deps: cherry-pick win/arm64/clang fixes
Refs: ngtcp2/nghttp3#112 Refs: ngtcp2/ngtcp2#692 Refs: HdrHistogram/HdrHistogram_c#114 PR-URL: #47011 Refs: ngtcp2/nghttp3#112 Refs: ngtcp2/ngtcp2#692 Refs: HdrHistogram/HdrHistogram_c#114 Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
1 parent 873606b commit be34777
Copy full SHA for be34777

File tree

Expand file treeCollapse file tree

4 files changed

+5
-5
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

4 files changed

+5
-5
lines changed
Open diff view settings
Collapse file

‎deps/histogram/src/hdr_atomic.h‎

Copy file name to clipboardExpand all lines: deps/histogram/src/hdr_atomic.h
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define HDR_ATOMIC_H__
99

1010

11-
#if defined(_MSC_VER)
11+
#if defined(_MSC_VER) && !(defined(__clang__) && (defined(_M_ARM) || defined(_M_ARM64)))
1212

1313
#include <stdint.h>
1414
#include <intrin.h>
Collapse file

‎deps/histogram/src/hdr_histogram.c‎

Copy file name to clipboardExpand all lines: deps/histogram/src/hdr_histogram.c
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ static int64_t power(int64_t base, int64_t exp)
127127
return result;
128128
}
129129

130-
#if defined(_MSC_VER)
130+
#if defined(_MSC_VER) && !(defined(__clang__) && (defined(_M_ARM) || defined(_M_ARM64)))
131131
# if defined(_WIN64)
132132
# pragma intrinsic(_BitScanReverse64)
133133
# else
@@ -137,7 +137,7 @@ static int64_t power(int64_t base, int64_t exp)
137137

138138
static int32_t count_leading_zeros_64(int64_t value)
139139
{
140-
#if defined(_MSC_VER)
140+
#if defined(_MSC_VER) && !(defined(__clang__) && (defined(_M_ARM) || defined(_M_ARM64)))
141141
uint32_t leading_zero = 0;
142142
#if defined(_WIN64)
143143
_BitScanReverse64(&leading_zero, value);
Collapse file

‎deps/ngtcp2/nghttp3/lib/nghttp3_ringbuf.c‎

Copy file name to clipboardExpand all lines: deps/ngtcp2/nghttp3/lib/nghttp3_ringbuf.c
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
#include "nghttp3_macro.h"
3535

36-
#if defined(_MSC_VER) && defined(_M_ARM64)
36+
#if defined(_MSC_VER) && !defined(__clang__) && (defined(_M_ARM) || defined(_M_ARM64))
3737
unsigned int __popcnt(unsigned int x) {
3838
unsigned int c = 0;
3939
for (; x; ++c) {
Collapse file

‎deps/ngtcp2/ngtcp2/lib/ngtcp2_ringbuf.c‎

Copy file name to clipboardExpand all lines: deps/ngtcp2/ngtcp2/lib/ngtcp2_ringbuf.c
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#include "ngtcp2_macro.h"
3333

34-
#if defined(_MSC_VER) && defined(_M_ARM64)
34+
#if defined(_MSC_VER) && !defined(__clang__) && (defined(_M_ARM) || defined(_M_ARM64))
3535
unsigned int __popcnt(unsigned int x) {
3636
unsigned int c = 0;
3737
for (; x; ++c) {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.