diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2007-07-15 04:06:29 +0800 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2007-07-15 04:06:29 +0800 |
| commit | 2233e76e983ac5f56faf66ebf6f689d04d257290 (patch) | |
| tree | cd5e040ca3443032c6d7dc211470202f4447d7e1 /audio/funktrackergold/files | |
| parent | 4437d2f0e822f4bdf83d4789b0b73bd463beac53 (diff) | |
| download | freebsd-ports-gnome-2233e76e983ac5f56faf66ebf6f689d04d257290.tar.gz freebsd-ports-gnome-2233e76e983ac5f56faf66ebf6f689d04d257290.tar.zst freebsd-ports-gnome-2233e76e983ac5f56faf66ebf6f689d04d257290.zip | |
- Fix build with gcc42.
Approved by: miwi (mentor)
Diffstat (limited to 'audio/funktrackergold/files')
| -rw-r--r-- | audio/funktrackergold/files/patch-dsp_mixxer.c | 50 | ||||
| -rw-r--r-- | audio/funktrackergold/files/patch-headers | 20 |
2 files changed, 50 insertions, 20 deletions
diff --git a/audio/funktrackergold/files/patch-dsp_mixxer.c b/audio/funktrackergold/files/patch-dsp_mixxer.c new file mode 100644 index 000000000000..34d646bb433f --- /dev/null +++ b/audio/funktrackergold/files/patch-dsp_mixxer.c @@ -0,0 +1,50 @@ +--- dsp_mixxer.c.orig Mon Jun 22 12:39:39 1998 ++++ dsp_mixxer.c Sat Jul 14 21:55:28 2007 +@@ -15,15 +15,11 @@ + ***************************************************************************/ + #include <stdio.h> + #include <math.h> +-#include <malloc.h> ++#include <stdlib.h> + #include <unistd.h> + #include <fcntl.h> + #include <sys/ioctl.h> +-#ifdef Linux +- #include <sys/soundcard.h> +-#elif FreeBSD +- #include <machine/soundcard.h> +-#endif ++#include <sys/soundcard.h> + #include "funktracker_defs.h" + #include "funktracker.h" + #include "funkload.h" +@@ -301,12 +297,12 @@ + + for(sample_no = 0;sample_no < mix_buffer_size;sample_no++) + { +- if(chmix[chan_no].funkctrl & 0x2) ++ if(chmix[chan_no].funkctrl & 0x2) { + #pragma pack(1) + sam = *((sDB *)chmix[chan_no].sample_addr + + (unsigned long)chmix[chan_no].sample_ptr); + #pragma pack() +- else ++ } else + sam = 0; + + #ifdef DIGITAL_ECHOING +@@ -363,12 +359,12 @@ + shift_t = 8 + shift_table[funk_info.no_active_channels]; + for(sample_no = 0;sample_no < mix_buffer_size;sample_no++) + { +- if(chmix[chan_no].funkctrl & 0x2) ++ if(chmix[chan_no].funkctrl & 0x2) { + #pragma pack(1) + sam = *((sDW *)chmix[chan_no].sample_addr + + (unsigned long)chmix[chan_no].sample_ptr); + #pragma pack() +- else ++ } else + sam = 0; + #ifdef DIGITAL_ECHOING + sam_reverb = *(chmix[chan_no].echo_buffer + diff --git a/audio/funktrackergold/files/patch-headers b/audio/funktrackergold/files/patch-headers index 621954cf7724..cecf6a20165b 100644 --- a/audio/funktrackergold/files/patch-headers +++ b/audio/funktrackergold/files/patch-headers @@ -1,23 +1,3 @@ ---- ../funkgold-orig/dsp_mixxer.c Mon Jun 22 20:09:39 1998 -+++ dsp_mixxer.c Sun Apr 1 17:51:50 2001 -@@ -15,15 +15,11 @@ - ***************************************************************************/ - #include <stdio.h> - #include <math.h> --#include <malloc.h> -+#include <stdlib.h> - #include <unistd.h> - #include <fcntl.h> - #include <sys/ioctl.h> --#ifdef Linux -- #include <sys/soundcard.h> --#elif FreeBSD -- #include <machine/soundcard.h> --#endif -+#include <sys/soundcard.h> - #include "funktracker_defs.h" - #include "funktracker.h" - #include "funkload.h" --- ../funkgold-orig/funkgold.c Sun Jun 21 22:10:54 1998 +++ funkgold.c Sun Apr 1 17:53:18 2001 @@ -23,7 +23,7 @@ |