diff options
| author | jmz <jmz@FreeBSD.org> | 2003-05-14 09:57:55 +0800 |
|---|---|---|
| committer | jmz <jmz@FreeBSD.org> | 2003-05-14 09:57:55 +0800 |
| commit | 6f1354bc2563feb006a65f3a8c4c68019d741dfa (patch) | |
| tree | be3448f042d5871ca30213e98216d505ab9f5b6e /audio/tclmidi | |
| parent | c959753bf718eecbee8135221f6941db658e97cd (diff) | |
| download | freebsd-ports-graphics-6f1354bc2563feb006a65f3a8c4c68019d741dfa.tar.gz freebsd-ports-graphics-6f1354bc2563feb006a65f3a8c4c68019d741dfa.tar.zst freebsd-ports-graphics-6f1354bc2563feb006a65f3a8c4c68019d741dfa.zip | |
The previous commit on this file unbroke the -current build but broke 4.x.
Now this patch should work both on 4.x and -current.
Diffstat (limited to 'audio/tclmidi')
| -rw-r--r-- | audio/tclmidi/files/patch-ac | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/audio/tclmidi/files/patch-ac b/audio/tclmidi/files/patch-ac index 5b141cf739b..4bb47854e3e 100644 --- a/audio/tclmidi/files/patch-ac +++ b/audio/tclmidi/files/patch-ac @@ -1,11 +1,20 @@ ---- smf/SMFTrack.cxx.orig Wed Dec 11 04:11:04 2002 -+++ smf/SMFTrack.cxx Wed Dec 11 04:11:22 2002 -@@ -355,7 +355,8 @@ +--- smf/SMFTrack.cxx.orig Mon Aug 5 05:47:36 1996 ++++ smf/SMFTrack.cxx Wed May 14 03:51:51 2003 +@@ -352,10 +352,17 @@ + return (1); + } + ++#include <sys/param.h> ostream & operator<<(ostream &os, const SMFTrack &t) { - long i, prev_flags; -+ std::_Ios_Fmtflags prev_flags; ++#if __FreeBSD_version < 500000 ++ long ++#else ++ std::_Ios_Fmtflags ++#endif ++ prev_flags; + long i; int prev_width; unsigned char *ptr; |