Skip to content

Use SWIFT_SDK_OVERLAY_DISPATCH_EPOCH to detect that an overlay is bei… #97

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 6, 2016
Merged

Use SWIFT_SDK_OVERLAY_DISPATCH_EPOCH to detect that an overlay is bei… #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dispatch/dispatch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
#endif

#ifdef __linux__
#ifdef __DISPATCH_BUILDING_SWIFT_MODULE__
#include <stdio.h> // for off_t
#if __has_feature(modules)
#include <stdio.h> // for off_t (to match Glibc.modulemap)
#endif
#define DISPATCH_LINUX_UNAVAILABLE() \
__DISPATCH_UNAVAILABLE("This interface is unavailable on linux systems")
Expand Down
2 changes: 1 addition & 1 deletion dispatch/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ typedef union {
#define DISPATCH_RETURNS_RETAINED
#endif

#if OS_OBJECT_SWIFT3
#if OS_OBJECT_SWIFT3 && OS_OBJECT_USE_OBJC
#define DISPATCH_SOURCE_TYPE_DECL(name) \
DISPATCH_EXPORT struct dispatch_source_type_s \
_dispatch_source_type_##name; \
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ SWIFT_GEN_FILES= \
$(SWIFT_OBJ_FILES:%=%.~partial.swiftdoc) \
$(SWIFT_OBJ_FILES:%=%.~partial.swiftdeps)

SWIFTC_FLAGS = -Xcc -D__DISPATCH_BUILDING_SWIFT_MODULE__=1 -Xcc -fmodule-map-file=$(abs_top_srcdir)/dispatch/module.modulemap -I$(abs_top_srcdir) -Xcc -fblocks
SWIFTC_FLAGS = -Xcc -fmodule-map-file=$(abs_top_srcdir)/dispatch/module.modulemap -I$(abs_top_srcdir) -Xcc -fblocks

$(abs_builddir)/swift/%.o: $(abs_srcdir)/swift/%.swift
$(SWIFTC) -frontend -c $(SWIFT_ABS_SRC_FILES) -primary-file $< \
Expand Down