summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/gcc/c-cppbuiltin.c5
-rw-r--r--sys/sys/param.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/contrib/gcc/c-cppbuiltin.c b/contrib/gcc/c-cppbuiltin.c
index 6dd6e18..6b65cdf 100644
--- a/contrib/gcc/c-cppbuiltin.c
+++ b/contrib/gcc/c-cppbuiltin.c
@@ -504,7 +504,10 @@ c_cpp_builtins (cpp_reader *pfile)
/* APPLE LOCAL begin blocks */
/* APPLE LOCAL radar 5868913 */
if (flag_blocks)
- cpp_define (pfile, "__BLOCKS__=1");
+ {
+ cpp_define (pfile, "__block=__attribute__((__blocks__(byref)))");
+ cpp_define (pfile, "__BLOCKS__=1");
+ }
/* APPLE LOCAL end blocks */
if (optimize_size)
cpp_define (pfile, "__OPTIMIZE_SIZE__");
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 05b5968..ae1704a 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1000705 /* Master, propagated to newvers */
+#define __FreeBSD_version 1000706 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
OpenPOWER on IntegriCloud