# Merge pull request \#17824 from kcbanner/fixup_msvc_fmax · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/7161ed79c4abcaccdd56fe0b4fbd3d93472d41b8)

Repository: [gitcafe/zig](https://git.cafe/gitcafe/zig)

Visibility: public

Requested revision: 7161ed79c4abcaccdd56fe0b4fbd3d93472d41b8

Requested commit: 7161ed79c4abcaccdd56fe0b4fbd3d93472d41b8

Commit: 7161ed79c4abcaccdd56fe0b4fbd3d93472d41b8

Tree: 0844cb58bfcb9ac48fc517738c0b78ff677007ab

Author: Andrew Kelley

Committer: GitHub

## Message

```
Merge pull request #17824 from kcbanner/fixup_msvc_fmax

cbe: add a system for avoiding collisions with C compiler intrinsics
```

## Parents

- [3f2a65594e1d3c0a4f4943a4ea522e8405db81e0](https://git.cafe/gitcafe/zig/commit/3f2a65594e1d3c0a4f4943a4ea522e8405db81e0?format=markdown)

- [50e2fb8fd0e1aae5fc3123d6f26d7420d4baa41c](https://git.cafe/gitcafe/zig/commit/50e2fb8fd0e1aae5fc3123d6f26d7420d4baa41c?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zig/tree/7161ed79c4abcaccdd56fe0b4fbd3d93472d41b8?format=markdown)