From 17324996684024a0f4675d19d81ef3e1bac8ce5c Mon Sep 17 00:00:00 2001
From: David Griffith <dave@661.org>
Date: Tue, 20 Feb 2018 04:30:59 -0800
Subject: [PATCH] Revert "Merge branch 'escondida-quetzal'"

This reverts commit a35ecc2eebbb6e6de6d314af5da2363f25b3e3cd, reversing
changes made to 92c121a4e36291f4836f852a573c549736104ec1.

Workaround for compilers lacking a fallthrough attribute failed.
---
 src/common/frotz.h   | 14 --------------
 src/common/quetzal.c |  2 --
 2 files changed, 16 deletions(-)

diff --git a/src/common/frotz.h b/src/common/frotz.h
index 7103e53..5794e4b 100644
--- a/src/common/frotz.h
+++ b/src/common/frotz.h
@@ -46,20 +46,6 @@ typedef int bool;
 #define PATH_SEPARATOR '/'
 #endif
 
-
-#ifndef __has_c_attribute	/* Optional */
-#define __has_c_attribute(x) 0	/* Compat with non-clang compilers */
-#endif
-
-#if __has_c_attribute(fallthrough)
-#define FALLTHROUGH [[fallthrough]]
-#elif  __GNUC__ >= 7
-#define FALLTHROUGH   __attribute__((fallthrough))
-#else
-#define FALLTHROUGH
-#endif
-
-
 /* typedef unsigned short zbyte; */
 typedef unsigned char zbyte;
 typedef unsigned short zword;
diff --git a/src/common/quetzal.c b/src/common/quetzal.c
index 459fe3e..3ef73e2 100644
--- a/src/common/quetzal.c
+++ b/src/common/quetzal.c
@@ -377,7 +377,6 @@ zword restore_quetzal (FILE *svf, FILE *stf)
 		    break;
 	    }
 		/* Fall right thru (to default) if already GOT_MEMORY */
-		FALLTHROUGH;
 	    /* `UMem' uncompressed memory chunk; load it. */
 	    case ID_UMem:
 		if (!(progress & GOT_MEMORY))	/* Don't complain if two. */
@@ -396,7 +395,6 @@ zword restore_quetzal (FILE *svf, FILE *stf)
 		    /* Fall into default action (skip chunk) on errors. */
 		}
 		/* Fall thru (to default) if already GOT_MEMORY */
-		FALLTHROUGH;
 	    /* Unrecognised chunk type; skip it. */
 	    default:
 		(void) fseek (svf, currlen, SEEK_CUR);	/* Skip chunk. */
-- 
2.34.1