From 061406c602aef0b71168802b99085fd16d16cdb0 Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <j@uriah.heep.sax.de>
Date: Wed, 11 Mar 2020 09:41:15 +0000
Subject: [PATCH] Fix compiler warnings

* misleading indentation after spin loop
* EM_AVR32 might be defined in system <libelf.h> already


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1431 81a1dc3b-b13d-400b-aceb-764788c761c2
---
 avr.c    | 9 +++++----
 fileio.c | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/avr.c b/avr.c
index 9abe6707..47d5ab05 100644
--- a/avr.c
+++ b/avr.c
@@ -80,11 +80,12 @@ int avr_tpi_chip_erase(PROGRAMMER * pgm, AVRPART * p)
 			0xFF
 		};
 
-    while (avr_tpi_poll_nvmbsy(pgm));
+    while (avr_tpi_poll_nvmbsy(pgm))
+        ;
 
-		err = pgm->cmd_tpi(pgm, cmd, sizeof(cmd), NULL, 0);
-		if(err)
-			return err;
+    err = pgm->cmd_tpi(pgm, cmd, sizeof(cmd), NULL, 0);
+    if(err)
+	return err;
 
     while (avr_tpi_poll_nvmbsy(pgm));
 
diff --git a/fileio.c b/fileio.c
index f2d61782..1746ef5d 100644
--- a/fileio.c
+++ b/fileio.c
@@ -34,7 +34,9 @@
 #elif defined(HAVE_LIBELF_LIBELF_H)
 #include <libelf/libelf.h>
 #endif
-#define EM_AVR32 0x18ad         /* inofficial */
+#ifndef EM_AVR32
+#  define EM_AVR32 0x18ad         /* inofficial */
+#endif
 #endif
 
 #include "avrdude.h"