diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 185de988a..7e59d84d0 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -1238,11 +1238,11 @@ public:
 #define MAX_CLIENTS 64
 
 enum fifo_client_connect_state
-  {
-   fc_unknown,
-   fc_connected,
-   fc_invalid
-  };
+{
+  fc_unknown,
+  fc_connected,
+  fc_invalid
+};
 
 enum
 {
diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc
index e0af54b2e..edc6caeb3 100644
--- a/winsup/cygwin/fhandler_fifo.cc
+++ b/winsup/cygwin/fhandler_fifo.cc
@@ -761,7 +761,7 @@ fhandler_fifo::hit_eof ()
   bool eof;
   bool retry = true;
 
-retry:
+repeat:
       fifo_client_lock ();
       eof = (nconnected == 0);
       fifo_client_unlock ();
@@ -770,7 +770,7 @@ retry:
 	  retry = false;
 	  /* Give the listen_client thread time to catch up. */
 	  Sleep (1);
-	  goto retry;
+	  goto repeat;
 	}
   return eof;
 }