New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix NOMINMAX macro redefined issue #3641

Merged

huili2 merged 3 commits into cisco:master from YCSun-Meta:master

Mar 29, 2023

Contributor

YCSun-Meta commented Mar 28, 2023

When we update openh264 version to Chrome, ( https://chromium-review.googlesource.com/c/chromium/src/+/4368477 )

we got a compile error on Chrome: https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket/8785448579561379729/+/u/compile/stdout

The error is about NOMINMAX macro redefine.
The issue is because:

#define NOMINMAX in crt_util_safe_x.h was added in https://github.com/cisco/openh264/pull/3608/files
However, it's set by compiler flag for Windows: https://source.chromium.org/chromium/chromium/src/+/main:third_party/perl/c/lib/gcc/i686-w64-mingw32/8.3.0/include/c++/i686-w64-mingw32/bits/os_defines.h?q=%22%23define%20NOMINMAX%201%22&ss=chromium

This pull request add macro checking to fix the issue.

Yu-Chen (Eric) Sun and others added 3 commits

March 23, 2023 17:30


          Fix PSkip fast algorithm from screen-sharing

51d61db


          Merge branch 'cisco:master' into master

6a26d1c


          Fix NOMINMAX macro redefined issue

c19f281

huili2 merged commit 09a4f3e into cisco:master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet