Fix build with gcc3.1.

This commit is contained in:
naddy 2002-07-20 20:15:04 +00:00
parent e9bb06905a
commit 6e05a7eab0
4 changed files with 37 additions and 3 deletions

View File

@ -1,11 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2002/05/23 16:14:01 naddy Exp $
# $OpenBSD: Makefile,v 1.3 2002/07/20 20:15:04 naddy Exp $
COMMENT= "text console audio player with an interactive interface"
DISTNAME= mp3blaster-3.1.1
CATEGORIES= audio
NEED_VERSION= 1.530
HOMEPAGE= http://www.stack.nl/~brama/mp3blaster/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_getopt_h,v 1.1 2002/07/20 20:15:05 naddy Exp $
--- src/getopt.h.orig Sat Jul 20 20:53:19 2002
+++ src/getopt.h Sat Jul 20 20:54:03 2002
@@ -103,7 +103,7 @@ struct option
errors, only prototype getopt for the GNU C library. */
extern int getopt (int argc, char *const *argv, const char *shortopts);
#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
+/* extern int getopt (); */
#endif /* __GNU_LIBRARY__ */
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_history_h,v 1.1 2002/07/20 20:15:05 naddy Exp $
--- src/history.h.orig Sat Jul 20 19:28:11 2002
+++ src/history.h Sat Jul 20 19:28:19 2002
@@ -21,7 +21,7 @@ public:
const char *element();
private:
- vector<char *> v;
+ std::vector<char *> v;
unsigned int curpos;
std::vector<char *>::iterator it;
};

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_main_cc,v 1.1 2002/07/20 20:15:05 naddy Exp $
--- src/main.cc.orig Sat Jul 20 21:48:51 2002
+++ src/main.cc Sat Jul 20 21:49:05 2002
@@ -3945,7 +3945,7 @@ fw_search_next_char(char nxt)
/* called when someone presses '/' in filemanager */
void
-fw_start_search(int timeout=2)
+fw_start_search(int timeout)
{
signal(SIGALRM, &fw_search_timeout);
fw_set_search_timeout(timeout);