tags 461668 + patch
thanks

Here's a proposed patch.

Regards,
    Simon
diff -u simulavr-0.1.2.2/debian/changelog simulavr-0.1.2.2/debian/changelog
--- simulavr-0.1.2.2/debian/changelog
+++ simulavr-0.1.2.2/debian/changelog
@@ -1,3 +1,12 @@
+simulavr (0.1.2.2-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix build with gcc 4.3 by applying #if 0 to unused code and turning
+    an extern inline function into static inline (Closes: #461668).
+  * Upgrade Homepage pseudo-field to a real field in debian/control.
+
+ -- Simon McVittie <[EMAIL PROTECTED]>  Sat, 05 Apr 2008 21:43:28 +0000
+
 simulavr (0.1.2.2-6) unstable; urgency=low
 
   * Adopting package (Closes: #345830)
diff -u simulavr-0.1.2.2/debian/control simulavr-0.1.2.2/debian/control
--- simulavr-0.1.2.2/debian/control
+++ simulavr-0.1.2.2/debian/control
@@ -4,6 +4,7 @@
 Maintainer: Arthur Loiret <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5), libncurses5-dev, avr-libc, gcc-avr, binutils-avr
 Standards-Version: 3.7.2
+Homepage: http://savannah.nongnu.org/projects/simulavr
 
 Package: simulavr
 Architecture: any
@@ -16,2 +16,0 @@
- .
-  Homepage: http://savannah.nongnu.org/projects/simulavr
only in patch2:
unchanged:
--- simulavr-0.1.2.2.orig/src/disp-vcd/config_scanner.c
+++ simulavr-0.1.2.2/src/disp-vcd/config_scanner.c
@@ -491,6 +491,7 @@
 static int yy_flex_strlen YY_PROTO(( yyconst char * ));
 #endif
 
+#if 0
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
 static int yyinput YY_PROTO(( void ));
@@ -498,6 +499,7 @@
 static int input YY_PROTO(( void ));
 #endif
 #endif
+#endif
 
 #if YY_STACK_USED
 static int yy_start_stack_ptr = 0;
@@ -1174,6 +1176,9 @@
 #endif	/* ifndef YY_NO_UNPUT */
 
 
+#if 0
+/* unused, which gcc 4.3 doesn't like */
+
 #ifdef __cplusplus
 static int yyinput()
 #else
@@ -1245,6 +1250,7 @@
 
 	return c;
 	}
+#endif
 
 
 #ifdef YY_USE_PROTOS
only in patch2:
unchanged:
--- simulavr-0.1.2.2.orig/src/avrcore.h
+++ simulavr-0.1.2.2/src/avrcore.h
@@ -284,13 +284,13 @@
 
 extern void avr_core_io_display_names (AvrCore *core);
 
-extern inline uint8_t
+static inline uint8_t
 avr_core_io_read (AvrCore *core, int reg)
 {
     return avr_core_mem_read (core, reg + IO_REG_ADDR_BEGIN);
 }
 
-extern inline void
+static inline void
 avr_core_io_write (AvrCore *core, int reg, uint8_t val)
 {
     avr_core_mem_write (core, reg + IO_REG_ADDR_BEGIN, val);

Attachment: signature.asc
Description: Digital signature

Reply via email to