From 7585811a602b21d633657050cd1ed954af9c5f41 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 2 Sep 2018 13:16:51 +0200
Subject: gcc2 fixes


diff --git a/lib/cdda_interface/utils.c b/lib/cdda_interface/utils.c
index 9aed89d..a4350df 100644
--- a/lib/cdda_interface/utils.c
+++ b/lib/cdda_interface/utils.c
@@ -178,6 +178,7 @@ gettime(struct timespec *ts) {
 #if defined(HAVE_CLOCK_GETTIME)
   /* Use clock_gettime if available, preferably using the monotonic clock.
    */
+  {
   static clockid_t clock = (clockid_t)-1;
   if ((int)clock == -1) clock = (clock_gettime(CLOCK_MONOTONIC, ts) < 0 ? CLOCK_REALTIME : CLOCK_MONOTONIC);
   ret = clock_gettime(clock, ts);
@@ -202,4 +203,5 @@ gettime(struct timespec *ts) {
 #endif
 
   return ret;
+  }
 }
diff --git a/lib/paranoia/paranoia.c b/lib/paranoia/paranoia.c
index 17a1139..f32fe48 100644
--- a/lib/paranoia/paranoia.c
+++ b/lib/paranoia/paranoia.c
@@ -1400,6 +1400,7 @@ i_stage2_each(root_block *root, v_fragment_t *v,
   /* If this fragment has already been merged & freed, abort. */
   if (!v || !v->one) return(0);
 
+  {
   cdrom_paranoia_t *p=v->p;
 
   /* "??? Why do we round down to an even dynoverlap?" Dynoverlap is
@@ -2118,6 +2119,7 @@ i_stage2_each(root_block *root, v_fragment_t *v,
 
     }
   } /* endif rv(root) */
+  }
 }
 
 static int
diff --git a/src/getopt.c b/src/getopt.c
index 80c7cb2..dce7d6a 100644
--- a/src/getopt.c
+++ b/src/getopt.c
@@ -877,6 +877,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 	if (longopts == NULL)
 	  goto no_longs;
 
+	{
 	char *nameend;
 	const struct option *p;
 	const struct option *pfound = NULL;
@@ -1096,6 +1097,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
       no_longs:
 	d->__nextchar = NULL;
 	return 'W';	/* Let the application handle it.   */
+	}
       }
     if (temp[1] == ':')
       {
-- 
2.16.4

