From owner-FreeBSD-users-jp@jp.freebsd.org  Mon Jul 20 20:15:53 1998
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.8.8+3.0Wbeta13/8.7.3) id UAA00803;
	Mon, 20 Jul 1998 20:15:53 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from mail-e0.jaist.ac.jp ([150.65.7.20])
	by jaz.jp.freebsd.org (8.8.8+3.0Wbeta13/8.7.3) with ESMTP id UAA00797
	for <FreeBSD-users-jp@jp.freebsd.org>; Mon, 20 Jul 1998 20:15:51 +0900 (JST)
	(envelope-from iwaki@jaist.ac.jp)
Received: from is19e1s01.jaist.ac.jp (is19e1s01 [150.65.249.4]) by mail-e0.jaist.ac.jp (3.6W-jaist_mail) with SMTP id UAA06913; Mon, 20 Jul 1998 20:15:39 +0900 (JST)
Date: Mon, r0 Jul 1998 20:15:39 +0900 (JST)
Message-Id: <199807201115.UAA06913@mail-e0.jaist.ac.jp>
To: FreeBSD-users-jp@jp.freebsd.org
From: iwaki@jaist.ac.jp (Mamoru Iwaki)
X-Mailer: mnews [version 1.21PL4] 1998-06/01(Mon)
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=24e+ JFUG special]
X-Sequence: FreeBSD-users-jp 30914
Subject: [FreeBSD-users-jp 30914] A patch for NetAudio software of DAT-Link
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org

$B4d>k!w(BJAIST$B$G$9!#(B

DAT-Link $B$N@)8f%W%m%0%i%`(B NetAudio software Version 2.28 $B$r(B FreeBSD
2.2.[56] $B$G%3%s%Q%$%k$G$-$k$h$&$K$9$k$?$a$N%Q%C%A$r:n$j$^$7$?!#$?$@(B
$B$7F0:n$r40A4J]>Z$9$k$b$N$G$O$"$j$^$;$s!#(BDAT-Link $B$N>\:Y$H(B NetAudio
software $B$N%=!<%9$O(B http://www.tc.com/ $B$+$iF@$i$l$^$9!#%Q%C%A$O(B 
2.2.5-RELEASE $B$N;~$K:n$C$?$N$G$9$,!"(B2.2.6-{RELEASE,STABLE} $B$G$b$=$N(B
$B$^$^(B OK $B$G$7$?!#(B

$B!t(BDAT-Link $B$O!"IaDL$NEE5$20$5$s$GGd$C$F$$$k$h$&$J5!4o$H$O0c$$!"2;4X(B
$B!t78$N8&5f!&3+H/$J?M$O;H$C$F$$$k$+$bCN$l$J$$$H$$$&DxEY$N$b$N$G$9!#$3(B
$B!t$N$h$&$J0UL#$G%^%$%J!<$J$b$N$KBP$9$k%Q%C%A$O!"2?=h$+$K=8$a$i$l$F$$(B
$B!t$^$9$+!)(B

$B:#2s$O!"%Q%C%A$,$"$^$jBg$-$/$J$$$N$!"$=$N$^$^KvHx$KE:IU$7$^$7$?!#(B

$B!t(BLinux$BMQ$N(BMATLAB$B$r(BFreeBSD$B$GF0$+$9$N$C$F4JC1$G$9$+!)CN$C$F$k?M$$$^$9(B
$B!t$+!)(B

-----< $B$3$3$+$i(B >-----< $B$3$3$+$i(B >-----< $B$3$3$+$i(B >-----
diff -cr NetAudio-2.28/SysConfig NetAudio-2.28_FreeBSD-2.2.5/SysConfig
*** NetAudio-2.28/SysConfig	Tue Oct 15 05:06:17 1996
--- NetAudio-2.28_FreeBSD-2.2.5/SysConfig	Sat Feb 14 23:58:20 1998
***************
*** 144,151 ****
  checkheader stdlib.h && DEFHEADERS="$DEFHEADERS stdlib.h"
  checkheader unistd.h && DEFHEADERS="$DEFHEADERS unistd.h"
  checkheader io.h && DEFHEADERS="$DEFHEADERS io.h"
  checkheader alloc.h
! checkheader malloc.h
  checkheader memory.h
  checkheader time.h
  checkheader syslog.h
--- 144,159 ----
  checkheader stdlib.h && DEFHEADERS="$DEFHEADERS stdlib.h"
  checkheader unistd.h && DEFHEADERS="$DEFHEADERS unistd.h"
  checkheader io.h && DEFHEADERS="$DEFHEADERS io.h"
+ if [ $OSTYPE = FreeBSD ]
+ then
+     checkheader sys/ioccom.h && DEFHEADERS="$DEFHEADERS sys/ioccom.h"
+ fi
  checkheader alloc.h
! if [ $OSTYPE = FreeBSD ]
! then
! else
!     checkheader malloc.h
! fi
  checkheader memory.h
  checkheader time.h
  checkheader syslog.h
diff -cr NetAudio-2.28/include/dat_types.h NetAudio-2.28_FreeBSD-2.2.5/include/dat_types.h
*** NetAudio-2.28/include/dat_types.h	Tue Oct 15 05:05:35 1996
--- NetAudio-2.28_FreeBSD-2.2.5/include/dat_types.h	Sun Feb 15 00:22:03 1998
***************
*** 61,64 ****
--- 61,68 ----
  #endif
  
  typedef unsigned int32 uint32;
+ 
+ #ifdef __FreeBSD__
+ #define int64 long long
+ #endif __FreeBSD__
  #endif /* !DAT_TYPES_H */
diff -cr NetAudio-2.28/libsconv/pgm_c.c NetAudio-2.28_FreeBSD-2.2.5/libsconv/pgm_c.c
*** NetAudio-2.28/libsconv/pgm_c.c	Tue Oct 15 05:09:57 1996
--- NetAudio-2.28_FreeBSD-2.2.5/libsconv/pgm_c.c	Sun Feb 15 01:00:49 1998
***************
*** 43,49 ****
--- 43,53 ----
  typedef char *caddr_t ;
  typedef unsigned int32 ino_t ;
  typedef short dev_t ;
+ #ifdef __FreeBSD__
+ typedef int64 off_t ;
+ #else __FreeBSD__
  typedef int32 off_t ;
+ #endif !__FreeBSD__
  typedef unsigned short uid_t ;
  typedef unsigned short gid_t ;
  typedef int32 key_t ;
***************
*** 367,375 ****
--- 371,387 ----
  int __1result ;
  if ((__1fd = open ( __0filename , 0, 0666 ) )< 0 )
  return -1;
+ #ifdef __FreeBSD__
+ __1fsizeint32 = lseek ( (int)__1fd , (off_t)0 , (int)2 ) ;
+ #else __FreeBSD__
  __1fsizeint32 = lseek ( __1fd , 0L , 2 ) ;
+ #endif !__FreeBSD__
  __1fsize = (((unsigned int )__1fsizeint32 ));
+ #ifdef __FreeBSD__
+ lseek ( (int)__1fd , (off_t)0 , (int)0 ) ;
+ #else __FreeBSD__
  lseek ( __1fd , 0L , (int )0 ) ;
+ #endif !__FreeBSD__
  __1buffer = (((unsigned char *)__nw__FUi ( (sizeof (unsigned char ))* __1fsize ) ));
  if (__1buffer == 0 ){ 
  NALog ( 3 , (char *)"Internal Error: Unable to allocate %u byte buffer to read %s.\n", __1fsize , __0filename ) ;
diff -cr NetAudio-2.28/libsupport/debug.c NetAudio-2.28_FreeBSD-2.2.5/libsupport/debug.c
*** NetAudio-2.28/libsupport/debug.c	Tue Oct 15 05:06:44 1996
--- NetAudio-2.28_FreeBSD-2.2.5/libsupport/debug.c	Sat Feb 14 23:58:20 1998
***************
*** 367,374 ****
--- 367,379 ----
  char *NAsyserr()
  {
  #ifdef HAS_sys_errlist
+ #ifdef __FreeBSD__
+     extern char *strerror();
+     return strerror(errno);
+ #else /* __FreeBSD__ */
      extern char *sys_errlist[];
      return sys_errlist[errno];
+ #endif /* !__FreeBSD__ */
  #else /* HAS_sys_errlist */
      return "???";
  #endif /* !HAS_sys_errlist */
-----< $B$3$3$^$G(B >-----< $B$3$3$^$G(B >-----< $B$3$3$^$G(B >-----
---
-----
 $BKLN&@hC<2J3X5;=QBg3X1!Bg3X(B $B>pJs2J3X8&5f2J(B
 $B4d>k(B $B8n(B (iwaki@jaist.ac.jp)
