From bbb5dab9edbc1956e8849102da26eb13d7986341 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 5 Dec 2011 22:44:08 +0000
Subject: Fix build with newer GCC

---
 cross/uisp/distinfo                    |  4 +++-
 cross/uisp/patches/patch-src_MotIntl.C | 22 ++++++++++++++++++++++
 cross/uisp/patches/patch-src_Stk500.C  | 13 +++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 cross/uisp/patches/patch-src_MotIntl.C
 create mode 100644 cross/uisp/patches/patch-src_Stk500.C

(limited to 'cross')

diff --git a/cross/uisp/distinfo b/cross/uisp/distinfo
index c65cfa21831..7c97ee8445a 100644
--- a/cross/uisp/distinfo
+++ b/cross/uisp/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.4 2011/09/03 21:59:18 dholland Exp $
+$NetBSD: distinfo,v 1.5 2011/12/05 22:44:08 joerg Exp $
 
 SHA1 (uisp-20040311.tar.bz2) = 8e4c1e05d2f9a962b8969fc76d8b448c9e0751d4
 RMD160 (uisp-20040311.tar.bz2) = 4f45d375e942376a2508232cf787f94ab7f8995b
 Size (uisp-20040311.tar.bz2) = 142973 bytes
 SHA1 (patch-aa) = 60d42fc897b8c77c8396823fd9b26b95adb68a77
+SHA1 (patch-src_MotIntl.C) = 456a47463f81da901c78822dc26e9e7683ac5b61
+SHA1 (patch-src_Stk500.C) = a2881e5e0591dc2efb58fa9bd6b84b8327f54b0e
 SHA1 (patch-src_avr_h) = f5ac07e1a8e3865e7c6bd3af86a1777bb068b5fd
 SHA1 (patch-src_dapa_c) = bc3fd2ecde373af2a2a3864f07efedd1177ecca0
diff --git a/cross/uisp/patches/patch-src_MotIntl.C b/cross/uisp/patches/patch-src_MotIntl.C
new file mode 100644
index 00000000000..14fad2319f1
--- /dev/null
+++ b/cross/uisp/patches/patch-src_MotIntl.C
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_MotIntl.C,v 1.1 2011/12/05 22:44:08 joerg Exp $
+
+--- src/MotIntl.C.orig	2011-12-05 20:37:28.000000000 +0000
++++ src/MotIntl.C
+@@ -110,7 +110,7 @@ void TMotIntl::UploadMotorola(){
+   do{
+     /* convert to upper case */
+     buf_len = strlen(line_buf);
+-    for (int i=0;i<buf_len;i++){line_buf[i] = toupper(line_buf[i]);}
++    for (int i=0;i<buf_len;i++){line_buf[i] = toupper((unsigned char)line_buf[i]);}
+   
+     if (line_buf[0]!='S'){throw Error_Device("Bad Motorola file format.");}
+     
+@@ -246,7 +246,7 @@ void TMotIntl::UploadIntel(){
+   do{
+     /* convert to upper case */
+     buf_len = strlen(line_buf);
+-    for (int i=0;i<buf_len;i++){line_buf[i] = toupper(line_buf[i]);}
++    for (int i=0;i<buf_len;i++){line_buf[i] = toupper((unsigned char)line_buf[i]);}
+   
+     if (line_buf[0]!=':'){throw Error_Device("Bad Intel file format.");}
+ 
diff --git a/cross/uisp/patches/patch-src_Stk500.C b/cross/uisp/patches/patch-src_Stk500.C
new file mode 100644
index 00000000000..c039b0fcfde
--- /dev/null
+++ b/cross/uisp/patches/patch-src_Stk500.C
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Stk500.C,v 1.1 2011/12/05 22:44:08 joerg Exp $
+
+--- src/Stk500.C.orig	2011-12-05 20:37:56.000000000 +0000
++++ src/Stk500.C
+@@ -407,7 +407,7 @@ void TStk500::FlushWriteBuffer(){
+   }
+ 
+   pgsz = prg_part[desired_part].params.pagesize;
+-  pagesize = (pgsz[0]) << 8 + pgsz[1];
++  pagesize = (pgsz[0] << 8) + pgsz[1];
+ 
+   if (pagesize == 0) {
+     pagesize = 128;
-- 
cgit v1.2.3