Imported Debian patch 1.01b-12.1

diff --git a/Makefile b/Makefile
index 458e6489f4915436372958808eb810a0e1ed7a1a..45a6c59eb9b7d9c648e96835a68d2156915ec307 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Possible defines in CONF:
 #      IS_MSDOS IS_SYSV IS_V7 IS_BSD HAS_DIRENT HAS_RENAME MV_DIR
 
-CC             =gcc -traditional
+CC             =gcc
 LD             =$(CC)
 CONF           =-DIS_SYSV -DHAS_DIRENT -DHAS_RENAME
 CFLAGS         =-O2 $(CONF)

diff --git a/debian/changelog b/debian/changelog
index 04f1fcdeeef8d4fa1bb954d70f4f4c2e0b447fd3..dce778f60ef6a63eaf565b82b6ca01f7e0667c10 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mmv (1.01b-12.1) unstable; urgency=low
+
+  * Non-Maintainer Upload (BSP 2005-08-06).
+  * Fixed FTBFS with gcc 3.4 / 4.0 by applying patch from
+    Andreas Jochens (Closes: #260574).
+
+ -- Uwe Hermann <uwe@debian.org>  Sat,  6 Aug 2005 22:07:06 +0200
+
 mmv (1.01b-12) unstable; urgency=low
 
   * LFS support! (not sure if this breaks something :) (Closes: Bug #106822)

diff --git a/mmv.c b/mmv.c
index 1215984a682712dfc8cd2aebee2b725e0aaeccc6..abce4a40b91e82f7642267970502af6b9a8cc7bd 100644 (file)
--- a/mmv.c
+++ b/mmv.c
@@ -88,6 +88,7 @@ Use -- as the end of options.\n";
 
 #endif
 
+#include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
 
@@ -127,10 +128,6 @@ extern unsigned _stklen = 10000;
 #include <sys/stat.h>
 #include <sys/file.h>
 
-extern char *getenv();
-extern long lseek();
-extern char *malloc();
-
 #ifdef HAS_DIRENT
 #include <dirent.h>
 typedef struct dirent DIRENTRY;
@@ -393,7 +390,7 @@ static int movealias(/* REP *first, REP *p, int *pprintaliased */);
 static int snap(/* REP *first, REP *p */);
 static void showdone(/* REP *fin */);
 static void breakout(/*  */);
-static int breakrep(/* */);
+static void breakrep(int);
 static void breakstat(/* */);
 static void quit(/*  */);
 static int copymove(/* REP *p */);
@@ -2585,10 +2582,10 @@ static void breakout()
 }
 
 
-static int breakrep()
+static void breakrep(int signum)
 {
        gotsig = 1;
-       return(1);
+       return;
 }