--- ./dao/CDD2600Base.cc	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./dao/CDD2600Base.cc	Sat Jul  7 19:04:18 2001
@@ -190,7 +190,7 @@
 	  indexCount, dataLen);
   */
 
-  data = new (unsigned char)[dataLen];
+  data = new unsigned char[dataLen];
   memset(data, 0, dataLen);
   tp = data;
 
--- ./dao/CdTextEncoder.cc	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./dao/CdTextEncoder.cc	Sat Jul  7 19:19:51 2001
@@ -439,7 +439,7 @@
     return;
   }
 
-  subChannels_ = new (PWSubChannel96*)[subChannelCount_];
+  subChannels_ = new PWSubChannel96*[subChannelCount_];
   
   prun = packs_;
 
--- ./dao/CdrDriver.cc	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./dao/CdrDriver.cc	Sat Jul  7 19:03:14 2001
@@ -737,10 +737,10 @@
   blocksPerWrite_ = 0;
   zeroBuffer_ = NULL;
 
-  transferBuffer_ = new (unsigned char)[scsiIf_->maxDataLen()];
+  transferBuffer_ = new unsigned char[scsiIf_->maxDataLen()];
 
   maxScannedSubChannels_ = scsiIf_->maxDataLen() / (AUDIO_BLOCK_LEN + 96);
-  scannedSubChannels_ = new (SubChannel*)[maxScannedSubChannels_];
+  scannedSubChannels_ = new SubChannel*[maxScannedSubChannels_];
 
   paranoia_ = NULL;
   paranoiaDrive_ = NULL;
@@ -1178,7 +1178,7 @@
   unsigned char cmd[10];
   long dataLen = bufLen + 8/*mode parameter header*/ + 
                           100/*spare for block descriptors*/;
-  unsigned char *data = new (unsigned char)[dataLen];
+  unsigned char *data = new unsigned char[dataLen];
 
   memset(cmd, 0, 10);
   memset(data, 0, dataLen);
@@ -1242,7 +1242,7 @@
   if (blockDesc != NULL)
     dataLen += 8;
 
-  unsigned char *data = new (unsigned char)[dataLen];
+  unsigned char *data = new unsigned char[dataLen];
 
   memset(cmd, 0, 10);
   memset(data, 0, dataLen);
@@ -1301,7 +1301,7 @@
   unsigned char cmd[6];
   long dataLen = bufLen + 4/*mode parameter header*/ + 
                           100/*spare for block descriptors*/;
-  unsigned char *data = new (unsigned char)[dataLen];
+  unsigned char *data = new unsigned char[dataLen];
 
   memset(cmd, 0, 6);
   memset(data, 0, dataLen);
@@ -1364,7 +1364,7 @@
   if (blockDesc != NULL)
     dataLen += 8;
 
-  unsigned char *data = new (unsigned char)[dataLen];
+  unsigned char *data = new unsigned char[dataLen];
 
   memset(cmd, 0, 6);
   memset(data, 0, dataLen);
@@ -1437,7 +1437,7 @@
     dataLen = (100 * 8) + 4;
   }
 
-  data = new (unsigned char)[dataLen];
+  data = new unsigned char[dataLen];
   memset(data, 0, dataLen);
 
   // read disk toc
@@ -2707,7 +2707,7 @@
     return NULL;
   }
 
-  data = new (unsigned char)[len];
+  data = new unsigned char[len];
 
   cmd[7] = len >> 8;
   cmd[8] = len;
@@ -3397,7 +3397,7 @@
   blocking = scsiIf_->maxDataLen() / AUDIO_BLOCK_LEN;;
   assert(blocking > 0);
 
-  buf = new (unsigned char)[blocking * blockLen];
+  buf = new unsigned char[blocking * blockLen];
 
   lba = lastLba = start;
   burst = blocking;
--- ./dao/PlextorReader.cc	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./dao/PlextorReader.cc	Sat Jul  7 19:06:55 2001
@@ -331,7 +331,7 @@
 
   message(4, "Raw toc data len: %d", dataLen);
 
-  data = new (unsigned char)[dataLen];
+  data = new unsigned char[dataLen];
   
   // read disk toc
   cmd[7] = dataLen >> 8;
@@ -562,7 +562,7 @@
 
   int overspeed,cai=-1;
 
-  data = new (unsigned char)[blocksPerRead * blockLength];  
+  data = new unsigned char[blocksPerRead * blockLength];  
 
   fat = startTrack;
   lat = endTrack;
--- ./dao/Makefile.in	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./dao/Makefile.in	Sat Jul  7 19:20:39 2001
@@ -92,7 +92,6 @@
 
 libdao.a: $(OBJ)
 	ar r libdao.a $(OBJ)
-	ranlib libdao.a
 
 %.o : %.cc
 	$(CXX) $(ALL_CXXFLAGS) -c $< -o $@
--- ./dao/GenericMMC.cc	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./dao/GenericMMC.cc	Sat Jul  7 19:08:02 2001
@@ -565,7 +565,7 @@
     len += t->nofIndices(); // entry for each index increment
   }
 
-  cueSheet = new (unsigned char)[len * 8];
+  cueSheet = new unsigned char[len * 8];
   n = 0;
 
   if (toc_->leadInMode() == TrackData::AUDIO) {
@@ -1563,7 +1563,7 @@
   if (len > bufLen)
     len = bufLen;
 
-  data = new (unsigned char)[len + 8];
+  data = new unsigned char[len + 8];
 
   cmd[7] = (len + 8) >> 8;
   cmd[8] = (len + 8);
@@ -1696,7 +1696,7 @@
   
   message(4, "Raw toc data len: %d", dataLen);
 
-  data = new (unsigned char)[dataLen];
+  data = new unsigned char[dataLen];
   
   // read disk toc
   cmd[7] = dataLen >> 8;
--- ./dao/main.cc	Sun Apr 29 06:42:09 2001
+++ ../cdrdao-1.1.5/./dao/main.cc	Sat Jul  7 19:01:19 2001
@@ -173,7 +173,7 @@
 
   case UNKNOWN:
     message(0, "\nUsage: %s <command> [options] [toc-file]", PRGNAME);
-    message(0, "
+    message(0, "\
 command:\n\
   show-toc  - prints out toc and exits\n\
   toc-info  - prints out short toc-file summary\n\
@@ -209,7 +209,7 @@
   
   case SIMULATE:
     message(0, "\nUsage: %s simulate [options] toc-file", PRGNAME);
-    message(0, "
+    message(0, "\
 options:\n\
   --device <x,y,z>        - sets SCSI device of CD-writer\n\
                             (default: %s)\n\
@@ -229,7 +229,7 @@
     
   case WRITE:
     message(0, "\nUsage: %s write [options] toc-file", PRGNAME);
-    message(0, "
+    message(0, "\
 options:\n\
   --device <x,y,z>        - sets SCSI device of CD-writer\n\
                             (default: %s)\n\
@@ -250,7 +250,7 @@
     
   case READ_TOC:
     message(0, "\nUsage: %s read-toc [options] toc-file", PRGNAME);
-    message(0, "
+    message(0, "\
 options:\n\
   --device <x,y,z> - sets SCSI device of CD-ROM reader\n\
   --driver <id>    - force usage of specified driver for source device\n\
@@ -270,7 +270,7 @@
     
   case DISK_INFO:
     message(0, "\nUsage: %s disk-info [options]", PRGNAME);
-    message(0, "
+    message(0, "\
 options:\n\
   --device <x,y,z>        - sets SCSI device of CD-writer\n\
                             (default: %s)\n\
@@ -281,7 +281,7 @@
     
   case READ_CD:
     message(0, "\nUsage: %s read-cd [options] toc-file", PRGNAME);
-    message(0, "
+    message(0, "\
 options:\n\
   --device <x,y,z> - sets SCSI device of CD-ROM reader\n\
   --driver <id>    - force usage of specified driver for source device\n\
@@ -310,13 +310,13 @@
 
   case BLANK:
     message(0, "\nUsage: %s blank [options]", PRGNAME);
-    message(0, "
+    message(0, "\
 options:\n\
   --device <x,y,z>        - sets SCSI device of CD-writer\n\
                             (default: %s)\n\
   --driver <id>           - force usage of specified driver\n\
   --speed <writing-speed> - selects writing speed\n\
-  --blank-mode <mode>     - blank mode ('full', 'minimal')
+  --blank-mode <mode>     - blank mode ('full', 'minimal')\n\
   --reload                - reload the disk if necessary for writing\n\
   -v #                    - sets verbose level\n",
 	  SCSI_DEVICE);
@@ -328,7 +328,7 @@
     
   case UNLOCK:
     message(0, "\nUsage: %s unlock [options]", PRGNAME);
-    message(0, "
+    message(0, "\
 options:\n\
   --device <x,y,z>        - sets SCSI device of CD-writer\n\
                             (default: %s)\n\
@@ -340,7 +340,7 @@
     
   case COPY_CD:
     message(0, "\nUsage: %s copy [options]", PRGNAME);
-    message(0, "
+    message(0, "\
 options:\n\
   --device <x,y,z>        - sets SCSI device of CD-writer\n\
                             (default: %s)\n\
@@ -376,7 +376,7 @@
   
   case READ_CDDB:
     message(0, "\nUsage: %s read-cddb [options] toc-file", PRGNAME);
-    message(0, "
+    message(0, "\
 options:\n\
   --cddb-servers <list>   - sets space separated list of CDDB servers\n\
   --cddb-timeout #        - timeout in seconds for CDDB server communication\n\
@@ -387,7 +387,7 @@
     
   case MSINFO:
     message(0, "\nUsage: %s msinfo [options]", PRGNAME);
-    message(0, "
+    message(0, "\
 options:\n\
   --device <x,y,z>        - sets SCSI device of CD-writer\n\
                             (default: %s)\n\
--- ./dao/GenericMMCraw.cc	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./dao/GenericMMCraw.cc	Sat Jul  7 19:09:24 2001
@@ -368,7 +368,7 @@
   // allocate buffer for sub-channel encoding
   n = blocksPerWrite_ * blockLength_;
   delete[] encodeBuffer_;
-  encodeBuffer_ = new (unsigned char)[n];
+  encodeBuffer_ = new unsigned char[n];
 
   /*
   SessionInfo sessInfo;
--- ./dao/TeacCdr55.cc	Sun Apr 29 06:42:09 2001
+++ ../cdrdao-1.1.5/./dao/TeacCdr55.cc	Sat Jul  7 19:18:11 2001
@@ -1322,7 +1322,7 @@
   if (dataLen == 4)
     return NULL;
 
-  data = new (unsigned char)[dataLen];
+  data = new unsigned char[dataLen];
   
   // read disk toc
   cmd[7] = dataLen >> 8;
--- ./dao/YamahaCDR10x.cc	Sun Apr 29 06:42:09 2001
+++ ../cdrdao-1.1.5/./dao/YamahaCDR10x.cc	Sat Jul  7 19:17:24 2001
@@ -340,7 +340,7 @@
     len += t->nofIndices(); // entry for each index increment
   }
 
-  cueSheet = new (unsigned char)[len * 8];
+  cueSheet = new unsigned char[len * 8];
   n = 0;
 
   if (toc_->leadInMode() == TrackData::AUDIO)
--- ./dao/CDD2600.cc	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./dao/CDD2600.cc	Sat Jul  7 19:06:02 2001
@@ -443,7 +443,7 @@
 {
   unsigned char cmd[10];
   unsigned long dataLen = 2 * blockLength_;
-  unsigned char *data = new (unsigned char)[dataLen];
+  unsigned char *data = new unsigned char[dataLen];
 
 
   // read sub channel information
@@ -663,7 +663,7 @@
 
   message(5, "Raw toc data len: %d", dataLen);
 
-  data = new (unsigned char)[dataLen];
+  data = new unsigned char[dataLen];
   
   // read disk toc
   cmd[7] = dataLen >> 8;
--- ./dao/SonyCDU920.cc	Sun Apr 29 06:42:09 2001
+++ ../cdrdao-1.1.5/./dao/SonyCDU920.cc	Sat Jul  7 19:19:26 2001
@@ -274,7 +274,7 @@
     len += t->nofIndices(); // entry for each index increment
   }
 
-  cueSheet = new (unsigned char)[len * 8];
+  cueSheet = new unsigned char[len * 8];
   n = 0;
 
   // entry for lead-in
@@ -825,7 +825,7 @@
   
   message(4, "Raw toc data len: %d", dataLen);
 
-  data = new (unsigned char)[dataLen];
+  data = new unsigned char[dataLen];
   
   // read disk toc
   cmd[7] = dataLen >> 8;
--- ./dao/PQChannelEncoder.cc	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./dao/PQChannelEncoder.cc	Sat Jul  7 19:09:03 2001
@@ -140,7 +140,7 @@
 
   // create PQ sub channels for toc in lead-in
   tocLen_ = lastTrackNr_ - firstTrackNr_ + 1 + 3/*A0, A1, A2*/;
-  toc_ = new (SubChannel*)[tocLen_];
+  toc_ = new SubChannel*[tocLen_];
 
   for (i = 0; i < tocLen_; i++) {
     toc_[i] = subChannel_->makeSubChannel(SubChannel::QMODE1TOC);
--- ./trackdb/Track.cc	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./trackdb/Track.cc	Mon Jul  9 17:48:37 2001
@@ -33,6 +33,8 @@
 
 Track::Track(TrackData::Mode t) : length_(0), start_(0), end_(0)
 {
+  int i;
+
   type_ = t;
 
   nofSubTracks_ = 0;
@@ -39,7 +41,7 @@
   subTracks_ = lastSubTrack_ = NULL;
 
   nofIndices_ = 0;
-  index_ = new Msf[98](0);
+  index_ = new Msf[98];
 
   isrcValid_ = 0;
 
@@ -71,7 +73,7 @@
   }
 
   nofIndices_ = obj.nofIndices_;
-  index_ = new Msf[98](0);
+  index_ = new Msf[98];
   for (i = 0; i < nofIndices_; i++) {
     index_[i] = obj.index_[i];
   }
--- ./trackdb/Cddb.cc	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./trackdb/Cddb.cc	Sat Jul  7 18:53:44 2001
@@ -590,7 +590,7 @@
 
   nargs = ntracks + 5;
 
-  args = new (const char*)[nargs];
+  args = new const char*[nargs];
   arg = 0;
 
   args[arg++] = "cddb";
@@ -1244,8 +1244,8 @@
   cddbEntry_->diskArtist = NULL;
   cddbEntry_->diskExt = NULL;
   cddbEntry_->ntracks = ntracks;
-  cddbEntry_->trackTitles = new (char*)[ntracks];
-  cddbEntry_->trackExt = new (char*)[ntracks];
+  cddbEntry_->trackTitles = new char*[ntracks];
+  cddbEntry_->trackExt = new char*[ntracks];
 
   for (i = 0; i < ntracks; i++) {
     cddbEntry_->trackTitles[i] = NULL;
--- ./trackdb/CdTextItem.cc	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./trackdb/CdTextItem.cc	Sat Jul  7 18:52:26 2001
@@ -17,6 +17,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdio.h>
 #include <iostream.h>
 #include <assert.h>
 #include <string.h>
@@ -36,7 +37,7 @@
 
   dataLen_ = strlen(data) + 1;
 
-  data_ = new (unsigned char)[dataLen_];
+  data_ = new unsigned char[dataLen_];
 
   strcpy((char *)data_, data);
 }
@@ -56,7 +57,7 @@
   dataLen_ = len;
 
   if (len > 0) {
-    data_ = new (unsigned char)[len];
+    data_ = new unsigned char[len];
     memcpy(data_, data, len);
   }
   else {
@@ -80,7 +81,7 @@
   if (description != NULL)
     dataLen_ += strlen(description) + 1;
 
-  data_ = new (unsigned char)[dataLen_];
+  data_ = new unsigned char[dataLen_];
   data_[0] = genreCode1;
   data_[1] = genreCode2;
 
@@ -99,7 +100,7 @@
   dataLen_ = obj.dataLen_;
 
   if (dataLen_ > 0) {
-    data_ = new (unsigned char)[dataLen_];
+    data_ = new unsigned char[dataLen_];
     memcpy(data_, obj.data_, dataLen_);
   }
   else {
@@ -129,7 +130,11 @@
       else if (isprint(data_[i]))
 	out << data_[i];
       else
-	out.form("\\%03o", (unsigned int)data_[i]);
+      {
+        char tmp[8];
+        sprintf(tmp, "\\%03o", (unsigned int)data_[i]);
+        out << tmp;
+      }
     }
 
     out << "\"";
@@ -140,7 +145,9 @@
     out << " {";
     for (i = 0; i < dataLen_; i++) {
       if (i == 0) {
-	out.form("%2d", (unsigned int)data_[i]);
+        char tmp[8];
+	sprintf(tmp, "%2d", (unsigned int)data_[i]);
+        out << tmp;
       }
       else {
 	if (i % 12 == 0) 
@@ -148,7 +155,11 @@
 	else
 	  out << ", ";
 
-	out.form("%2d", (unsigned int)data_[i]);
+        {
+          char tmp[8];
+	  sprintf(tmp, "%2d", (unsigned int)data_[i]);
+          out << tmp;
+        }
       }
     }
 
--- ./paranoia/paranoia.c	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./paranoia/paranoia.c	Sat Jul  7 18:56:21 2001
@@ -58,25 +58,25 @@
 #include "gap.h"
 #include "isort.h"
 
-static inline long re(root_block *root){
+static long re(root_block *root){
   if(!root)return(-1);
   if(!root->vector)return(-1);
   return(ce(root->vector));
 }
 
-static inline long rb(root_block *root){
+static long rb(root_block *root){
   if(!root)return(-1);
   if(!root->vector)return(-1);
   return(cb(root->vector));
 }
 
-static inline long rs(root_block *root){
+static long rs(root_block *root){
   if(!root)return(-1);
   if(!root->vector)return(-1);
   return(cs(root->vector));
 }
 
-static inline size16 *rv(root_block *root){
+static size16 *rv(root_block *root){
   if(!root)return(NULL);
   if(!root->vector)return(NULL);
   return(cv(root->vector));
@@ -86,7 +86,7 @@
 
 /**** matching and analysis code *****************************************/
 
-static inline long i_paranoia_overlap(size16 *buffA,size16 *buffB,
+static long i_paranoia_overlap(size16 *buffA,size16 *buffB,
 			       long offsetA, long offsetB,
 			       long sizeA,long sizeB,
 			       long *ret_begin, long *ret_end){
@@ -106,7 +106,7 @@
   return(endA-beginA);
 }
 
-static inline long i_paranoia_overlap2(size16 *buffA,size16 *buffB,
+static long i_paranoia_overlap2(size16 *buffA,size16 *buffB,
 				       char *flagsA,char *flagsB,
 				       long offsetA, long offsetB,
 				       long sizeA,long sizeB,
@@ -153,7 +153,7 @@
 
 #define OVERLAP_ADJ (MIN_WORDS_OVERLAP/2-1)
 
-static inline long do_const_sync(c_block *A,
+static long do_const_sync(c_block *A,
 				 sort_info *B,char *flagB,
 				 long posA,long posB,
 				 long *begin,long *end,long *offset){
@@ -182,7 +182,7 @@
    from new.  In stage 2 we post from root. Begin, end, offset count
    from B's frame of reference */
 
-static inline long try_sort_sync(cdrom_paranoia *p,
+static long try_sort_sync(cdrom_paranoia *p,
 				 sort_info *A,char *Aflags,
 				 c_block *B,
 				 long post,long *begin,long *end,
@@ -232,7 +232,7 @@
   return(0);
 }
 
-static inline void stage1_matched(c_block *old,c_block *new,
+static void stage1_matched(c_block *old,c_block *new,
 				 long matchbegin,long matchend,
 				 long matchoffset,void (*callback)(long,int)){
   long i;
--- ./configure.in	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./configure.in	Sat Jul  7 19:32:37 2001
@@ -267,6 +267,10 @@
 		thread_libs=""
 	      fi
 	      ;;
+  *-irix*)
+	if test "$use_pthreads" = yes; then
+		thread_libs="-lpthread"
+	fi
 esac
 
 dnl Sound device selection for xcdrdao
--- ./utils/toc2cue.cc	Sun Apr 29 06:42:09 2001
+++ ../cdrdao-1.1.5/./utils/toc2cue.cc	Sat Jul  7 19:35:28 2001
@@ -291,7 +291,11 @@
        trun != NULL;
        trun = titr.next(start, end), trackNr++) {
     out << "  TRACK ";
-    out.form("%02d ", trackNr);
+    {
+      char tmp[8];
+      sprintf(tmp, "%02d\n", trackNr);
+      out << tmp;
+    }
 
     switch (trun->type()) {
     case TrackData::AUDIO:
--- ./configure	Sun Apr 29 06:42:08 2001
+++ ../cdrdao-1.1.5/./configure	Sat Jul  7 19:32:41 2001
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.15 
+# From configure.in Revision: 1.16 
 cdrdao_version=1.1.5
 
 # Configure paths for GTK--
@@ -3771,6 +3771,10 @@
 		thread_libs=""
 	      fi
 	      ;;
+  *-irix*)
+	if test "$use_pthreads" = yes; then
+		thread_libs="-lpthread"
+	fi
 esac
 
 case "$host" in
--- ./scsilib/TARGETS/Targetdirs	Sat Oct 28 10:02:27 2000
+++ ../cdrdao-1.1.5/./scsilib/TARGETS/Targetdirs	Wed Nov  7 15:54:42 2001
@@ -1,4 +1,4 @@
 #ident %W% %E% %Q%
 ###########################################################################
-DIRS=		conf inc lib libscg librscg libdeflt rscsi export
+DIRS=		conf inc lib libscg librscg libdeflt export
 ###########################################################################