Skip to content
This repository has been archived by the owner on Mar 4, 2020. It is now read-only.

fix: include names.h in zlib header package #74

Merged

Conversation

adill
Copy link

@adill adill commented Oct 11, 2018

No description provided.

@adill adill requested a review from nornagon October 11, 2018 23:04
Copy link
Member

@nornagon nornagon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, for anyone in the future who might be digging around to find out why this header is needed in electron's headers but not node's (see node's install script which doesn't include names.h), it's because we build against Chromium's zlib, which redefines all zlib names as Cr_z_: https://chromium.googlesource.com/chromium/src/+/69.0.3497.106/third_party/zlib/names.h

@nornagon nornagon merged commit 42ddb00 into electron:electron-node-v10.11.0-V8-6.9 Oct 11, 2018
@nornagon
Copy link
Member

Thanks @adill!

@adill adill deleted the missing-zlib-headers branch October 11, 2018 23:20
nornagon added a commit to electron/electron that referenced this pull request Oct 11, 2018
picks up electron/node#74: fix: include names.h in zlib header package
@nornagon nornagon mentioned this pull request Oct 11, 2018
2 tasks
nornagon added a commit to electron/electron that referenced this pull request Oct 11, 2018
picks up:
- electron/node#73: fix: export libuv symbols
- electron/node#74: fix: include names.h in zlib header package
trop-bot pushed a commit to trop-bot/electron that referenced this pull request Oct 11, 2018
picks up:
- electron/node#73: fix: export libuv symbols
- electron/node#74: fix: include names.h in zlib header package
jkleinsc pushed a commit to electron/electron that referenced this pull request Oct 12, 2018
picks up:
- electron/node#73: fix: export libuv symbols
- electron/node#74: fix: include names.h in zlib header package
trop-bot pushed a commit to trop-bot/electron that referenced this pull request Oct 12, 2018
picks up:
- electron/node#73: fix: export libuv symbols
- electron/node#74: fix: include names.h in zlib header package
codebytere pushed a commit to electron/electron that referenced this pull request Oct 12, 2018
picks up:
- electron/node#73: fix: export libuv symbols
- electron/node#74: fix: include names.h in zlib header package
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants