Merge pull request swiftlang#62 from dgrove-oss/fix-import-for-03242016-drop

Build fix for Linux overlay with 03242016 compiler.

Author: MadCoder

dispatch/dispatch.h

@@ -26,6 +26,7 @@
 #include <TargetConditionals.h>
 #endif
 #include <sys/cdefs.h>
+#include <sys/types.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>

dispatch/io.h

@@ -26,6 +26,10 @@
 #include <dispatch/base.h> // for HeaderDoc
 #endif
 
+#ifdef __DISPATCH_BUILDING_SWIFT_MODULE__
+#include <stdio.h>
+#endif
+
 __BEGIN_DECLS
 
 /*! @header

src/Makefile.am

@@ -125,7 +125,7 @@ SWIFT_OBJECTS=	\
 	$(abs_builddir)/Dispatch.swiftdoc \
 	$(abs_builddir)/Dispatch.o
 
-SWIFTC_FLAGS = -Xcc -fmodule-map-file=$(abs_top_srcdir)/dispatch/module.map -I$(abs_top_srcdir) -parse-as-library -Xcc -fblocks
+SWIFTC_FLAGS = -Xcc -D__DISPATCH_BUILDING_SWIFT_MODULE__=1 -Xcc -fmodule-map-file=$(abs_top_srcdir)/dispatch/module.map -I$(abs_top_srcdir) -parse-as-library -Xcc -fblocks
 
 $(abs_builddir)/Dispatch.o: $(abs_srcdir)/swift/Dispatch.swift
 	$(SWIFTC) $(SWIFTC_FLAGS) -c -o $@ $<