Skip to content
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.

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

MAINT: move buffer.h -> npy_buffer.h to avoid conflicts #14866

Merged
merged 1 commit into from Nov 8, 2019

Conversation

@charris
Copy link
Member

charris commented Nov 8, 2019

Backport of #14830.

Fixes gh-13281

Openssl has its own buffer.h file, move ours to avoid conflict

@charris charris added this to the 1.17.4 release. milestone Nov 8, 2019
@charris charris merged commit 20b5b08 into numpy:maintenance/1.17.x Nov 8, 2019
16 checks passed
16 checks passed
LGTM analysis: JavaScript No code changes detected
Details
LGTM analysis: C/C++ No new or fixed alerts
Details
LGTM analysis: Python No new or fixed alerts
Details
Shippable Run 6990 status is SUCCESS.
Details
azure-pipeline numpy.numpy Build #20191108.17 succeeded
Details
azure-pipeline numpy.numpy (Linux_PyPy3) Linux_PyPy3 succeeded
Details
azure-pipeline numpy.numpy (Linux_Python_36_32bit_full_with_asserts) Linux_Python_36_32bit_full_with_asserts succeeded
Details
azure-pipeline numpy.numpy (Windows Python35-64bit-full) Windows Python35-64bit-full succeeded
Details
azure-pipeline numpy.numpy (Windows Python36-32bit-fast) Windows Python36-32bit-fast succeeded
Details
azure-pipeline numpy.numpy (Windows Python36-64bit-full) Windows Python36-64bit-full succeeded
Details
azure-pipeline numpy.numpy (Windows Python37-32bit-fast) Windows Python37-32bit-fast succeeded
Details
azure-pipeline numpy.numpy (Windows Python37-64bit-full) Windows Python37-64bit-full succeeded
Details
azure-pipeline numpy.numpy (macOS) macOS succeeded
Details
ci/circleci Your tests passed on CircleCI!
Details
codecov/project 85.75% (target 1%)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@charris charris deleted the charris:backport-14830 branch Nov 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.