Revert "Merge branch 'escondida-quetzal'"

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

Workaround for compilers lacking a fallthrough attribute failed.

diff --git a/src/common/frotz.h b/src/common/frotz.h
index 7103e53c04944a7ad12a6970c7034a5a3af5ed03..5794e4b7f2bd26fdd81e8cd4846208bae41a8419 100644 (file)
--- 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 459fe3e98607f250908b05e23504d3b5f80ac45a..3ef73e252734a61a76eb9b363953c154a346071d 100644 (file)
--- 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. */