From 6c3b6244bd436a3764a1fb6167a8dd3f84d3f620 Mon Sep 17 00:00:00 2001
From: joerg_wunsch <joerg_wunsch@81a1dc3b-b13d-400b-aceb-764788c761c2>
Date: Wed, 16 Jul 2014 20:38:52 +0000
Subject: [PATCH] bug #42662 clang warnings under FreeBSD 10.x * avrftdi.h: Fix
 header guard macro name. * pgm_type.c (programmers_types): Remove duplicate
 "const".

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1329 81a1dc3b-b13d-400b-aceb-764788c761c2
---
 ChangeLog  | 6 ++++++
 avrftdi.h  | 2 +-
 pgm_type.c | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 564149ba..1dc4796e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-16  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	bug #42662 clang warnings under FreeBSD 10.x
+	* avrftdi.h: Fix header guard macro name.
+	* pgm_type.c (programmers_types): Remove duplicate "const".
+
 2014-07-16  Rene Liebscher <R.Liebscher@gmx.de>
 
 	bug #42662 clang warnings under FreeBSD 10.x
diff --git a/avrftdi.h b/avrftdi.h
index 8dee7935..af323352 100644
--- a/avrftdi.h
+++ b/avrftdi.h
@@ -19,7 +19,7 @@
 /* $Id$ */
 
 #ifndef avrftdi_h
-#define avrfdti_h
+#define avrftdi_h
 
 #include <stdint.h>
 
diff --git a/pgm_type.c b/pgm_type.c
index 02c6337a..7724987f 100644
--- a/pgm_type.c
+++ b/pgm_type.c
@@ -52,7 +52,7 @@
 #include "wiring.h"
 
 
-const PROGRAMMER_TYPE const programmers_types[] = {
+const PROGRAMMER_TYPE programmers_types[] = {
         {"arduino", arduino_initpgm, arduino_desc},
         {"avr910", avr910_initpgm, avr910_desc},
         {"avrftdi", avrftdi_initpgm, avrftdi_desc},