--- include/asterisk/time.h	(Asterisk 15.2)
+++ include/asterisk/time.h	(working copy)
@@ -38,2 +38,2 @@
-typedef typeof(dummy_tv_var_for_types.tv_sec) ast_time_t;
-typedef typeof(dummy_tv_var_for_types.tv_usec) ast_suseconds_t;
+typedef __typeof__(dummy_tv_var_for_types.tv_sec) ast_time_t;
+typedef __typeof__(dummy_tv_var_for_types.tv_usec) ast_suseconds_t;
--- include/asterisk/utils.h	(Asterisk 15.2)
+++ include/asterisk/utils.h	(working copy)
@@ -230 +230 @@
-#define SWAP(a,b) do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)
+#define SWAP(a,b) do { __typeof__(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)
--- include/asterisk/strings.h	(Asterisk 15.2)
+++ include/asterisk/strings.h	(working copy)
@@ -745 +745 @@
-		if ((typeof(buf->__AST_STR_USED)) -len >= buf->__AST_STR_USED) {
+		if ((__typeof__(buf->__AST_STR_USED)) -len >= buf->__AST_STR_USED) {