Skip to content

Commit 8de6d9f

Browse files
committed
libdispatch: Avoid submodules for headers that should not be included
libdispatch has an umbrella header, dispatch.h, that should be used for including all of the other headers. This is enforced via __DISPATCH_INDIRECT__. Since it isn't legal to include one of the other headers on their own, it isn't logical to have submodules for them. Moreover, submodules *should* have local visibility (be unaware of the context they're included from); meaning that __DISPATCH_INDIRECT__ will never be defined. Logically, all of the headers are part of a single module/interface. Patch by me & Duncan P. Exon Smith
1 parent a69853f commit 8de6d9f

File tree

4 files changed

+0
-4
lines changed

4 files changed

+0
-4
lines changed

dispatch/darwin/module.modulemap

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module Dispatch [system] [extern_c] {
22
umbrella header "dispatch.h"
3-
module * { export * }
43
export *
54
}
65

dispatch/generic/module.modulemap

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ module DispatchIntrospection [system] [extern_c] {
1111

1212
module CDispatch [system] [extern_c] {
1313
umbrella header "dispatch.h"
14-
module * { export * }
1514
export *
1615
requires blocks
1716
link "dispatch"

private/darwin/module.modulemap

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module DispatchPrivate [system] [extern_c] {
22
umbrella header "private.h"
33
exclude header "mach_private.h"
4-
module * { export * }
54
export *
65
}
76

private/generic/module.modulemap

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module DispatchPrivate [system] [extern_c] {
22
umbrella header "private.h"
33
exclude header "mach_private.h"
4-
module * { export * }
54
export *
65
}
76

0 commit comments

Comments
 (0)