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

use umbrella headers for C modules #636

Merged
merged 1 commit into from Oct 19, 2018

Conversation

Projects
None yet
2 participants
@weissi
Contributor

weissi commented Oct 18, 2018

Motivation:

SwiftPM only generates fully usable clang modules for C modules if they
have umbrella headers. Therefore, adding a generated NIO.xcodeproj to
another Xcode project as a sub-project never worked.
To make a header an umbrella header you need to name them exactly like
the module.

Modifications:

give each C module an umbrella header

Result:

generated NIO Xcode projects can be used as sub-projects.

Thanks so much to @aciidb0mb3r for pointing this out, made my day!

@weissi weissi requested a review from Lukasa Oct 18, 2018

@Lukasa Lukasa added this to the 1.10.0 milestone Oct 18, 2018

@@ -34,9 +34,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef WEBRTC_BASE_IFADDRS_ANDROID_H_
#define WEBRTC_BASE_IFADDRS_ANDROID_H_
#ifdef ifdef __ANDROID__

This comment has been minimized.

@Lukasa

Lukasa Oct 18, 2018

Contributor

This looks wrong.

@@ -48,10 +48,6 @@
#define _CRYPTO_SHA1_H_
#include <sys/types.h>
#ifdef __ANDROID__
#include <sys/endian.h>
#endif

This comment has been minimized.

@Lukasa

Lukasa Oct 18, 2018

Contributor

Why was this removed? It doesn't appear to have been replaced anywhere.

This comment has been minimized.

@weissi

weissi Oct 19, 2018

Contributor

ran the updater script, will fix it

use umbrella headers for C modules
Motivation:

SwiftPM only generates fully usable clang modules for C modules if they
have umbrella headers. Therefore, adding a generated NIO.xcodeproj to
another Xcode project as a sub-project never worked.
To make a header an umbrella header you need to name them _exactly_ like
the module.

Modifications:

give each C module an umbrella header

Result:

generated NIO Xcode projects can be used as sub-projects.
@Lukasa

Lukasa approved these changes Oct 19, 2018

struct sockaddr *ifu_dstaddr;
} ifa_ifu;
/* Real ifaddrs has broadcast, point to point and data members.
* We don't need them (yet?). */

This comment has been minimized.

@Lukasa

Lukasa Oct 19, 2018

Contributor

For future reviewers: this change was introduced upstream, we're not worrying about it here.

@Lukasa Lukasa merged commit 9bae007 into apple:master Oct 19, 2018

3 checks passed

pull request validation (4.0.3) Build finished.
Details
pull request validation (4.1) Build finished.
Details
pull request validation (4.2) Build finished.
Details

@weissi weissi deleted the weissi:jw-umbrella branch Oct 19, 2018

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