Merge pull request swiftlang#236 from bcardosolopes/master

das · web-flow · commit eea06670a1c4 · 2017-04-11T16:56:05.000-07:00
libdispatch: Avoid submodules for headers that should not be included
diff --git a/dispatch/darwin/module.modulemap b/dispatch/darwin/module.modulemap
@@ -1,6 +1,5 @@
 module Dispatch [system] [extern_c] {
 	umbrella header "dispatch.h"
-	module * { export * }
 	export *
 }
 
diff --git a/dispatch/generic/module.modulemap b/dispatch/generic/module.modulemap
@@ -11,7 +11,6 @@ module DispatchIntrospection [system] [extern_c] {
 
 module CDispatch [system] [extern_c] {
 	umbrella header "dispatch.h"
-	module * { export * }
 	export *
 	requires blocks
 	link "dispatch"
diff --git a/private/darwin/module.modulemap b/private/darwin/module.modulemap
@@ -1,7 +1,6 @@
 module DispatchPrivate [system] [extern_c] {
 	umbrella header "private.h"
 	exclude header "mach_private.h"
-	module * { export * }
 	export *
 }
 
diff --git a/private/generic/module.modulemap b/private/generic/module.modulemap
@@ -1,7 +1,6 @@
 module DispatchPrivate [system] [extern_c] {
 	umbrella header "private.h"
 	exclude header "mach_private.h"
-	module * { export * }
 	export *
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`module Dispatch [system] [extern_c] {`
`2`	`2`	`umbrella header "dispatch.h"`
`3`		`- module * { export * }`
`4`	`3`	`export *`
`5`	`4`	`}`
`6`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`module DispatchPrivate [system] [extern_c] {`
`2`	`2`	`umbrella header "private.h"`
`3`	`3`	`exclude header "mach_private.h"`
`4`		`- module * { export * }`
`5`	`4`	`export *`
`6`	`5`	`}`
`7`	`6`