unified diffs

This commit is contained in:
brad 2000-03-23 23:18:37 +00:00
parent 1e98454e37
commit 8935e7eb44
3 changed files with 36 additions and 53 deletions

View File

@ -1,20 +1,13 @@
*** audioIO.h.orig Mon Sep 1 19:33:43 1997 --- audioIO.h.orig Sat May 31 13:47:58 1997
--- audioIO.h Mon Sep 1 19:34:04 1997 +++ audioIO.h Thu Mar 23 12:39:13 2000
*************** extern int AUSIZ; @@ -11,9 +11,7 @@
*** 12,18 **** extern int AUSIZ;
#endif #endif
! #ifdef OS_BSD -#ifdef OS_BSD
! #define AUSIZ 32768 - #define AUSIZ 32768
! #endif -#endif
+extern int AUSIZ;
#if defined(OS_IRIX) || defined(OS_IRIX64)
--- 12,19 ----
#endif
! /* #ifdef OS_BSD */
! /* #define AUSIZ 32768 */
! extern int AUSIZ;
! /* #endif */
#if defined(OS_IRIX) || defined(OS_IRIX64) #if defined(OS_IRIX) || defined(OS_IRIX64)
#define AUSIZ 32768

View File

@ -1,19 +1,11 @@
*** Makefile.in.orig Sun May 3 21:27:55 1998 --- Makefile.in.orig Sat Aug 23 05:54:35 1997
--- Makefile.in Sun May 3 21:28:09 1998 +++ Makefile.in Thu Mar 23 12:14:00 2000
*************** @@ -24,7 +24,7 @@
*** 24,30 ****
OBJ = dump.o formats.o getbits.o huffman.o layer3.o getdata.o misc2.o transform.o audio.o \ OBJ = dump.o formats.o getbits.o huffman.o layer3.o getdata.o misc2.o transform.o audio.o \
args.o buffer.o audioIO.o position.o layer2.o rtbuf.o guicontrol.o util.o getopt.o getopt1.o args.o buffer.o audioIO.o position.o layer2.o rtbuf.o guicontrol.o util.o getopt.o getopt1.o
! LIBS = -lm -LIBS = -lm
+LIBS = -lm -lossaudio
all: amp
--- 24,30 ----
OBJ = dump.o formats.o getbits.o huffman.o layer3.o getdata.o misc2.o transform.o audio.o \
args.o buffer.o audioIO.o position.o layer2.o rtbuf.o guicontrol.o util.o getopt.o getopt1.o
! LIBS = -lm -lossaudio
all: amp all: amp

View File

@ -1,7 +1,6 @@
*** audioIO.c.orig Sun May 3 21:29:40 1998 --- audioIO.c.orig Sat May 31 13:47:58 1997
--- audioIO.c Sun May 3 21:29:47 1998 +++ audioIO.c Thu Mar 23 12:14:01 2000
*************** @@ -6,9 +6,7 @@
*** 6,14 ****
#include "audioIO_Linux.c" #include "audioIO_Linux.c"
#endif #endif
@ -11,4 +10,3 @@
#if defined(OS_IRIX) || defined(OS_IRIX64) #if defined(OS_IRIX) || defined(OS_IRIX64)
#include "audioIO_IRIX.c" #include "audioIO_IRIX.c"
--- 6,12 ----