cd /usr/local/src/
diff -c /usr/local/src/crblib\~ /usr/local/src/crblib
Only in /usr/local/src/crblib~: MATRIX.C
Only in /usr/local/src/crblib~: MATRIX.H
Only in /usr/local/src/crblib: Makefile
Only in /usr/local/src/crblib~: VECTOR.C
Only in /usr/local/src/crblib~: VECTOR.H
Only in /usr/local/src/crblib~: bmpio.c
Only in /usr/local/src/crblib~: bmpio.h
diff -c /usr/local/src/crblib~/chshutil.c /usr/local/src/crblib/chshutil.c
*** /usr/local/src/crblib~/chshutil.c	2000-03-27 14:19:06.000000000 -0500
--- /usr/local/src/crblib/chshutil.c	2004-06-07 17:30:09.000000000 -0400
***************
*** 10,16 ****
--- 10,20 ----
  #include <crblib/inc.h>
  #include <crblib/fileutil.h>
  
+ #ifdef unix
+ #include <unistd.h>
+ #else
  #include <io.h>
+ #endif
  
  bool Skipped=0,MadeDir=0;
  
***************
*** 140,146 ****
--- 144,154 ----
  
  if ( FmIsDir )
  	{
+ #ifdef unix
+ 	if ( mkdir(ToName, 0777) ==0 )
+ #else
  	if ( mkdir(ToName) ==0 )
+ #endif
  		{
  		MadeDir =1;
  		return(1);
***************
*** 400,406 ****
  bool CheckAndChangeAccess(char * Name)
  {
  
! #ifdef __WATCOMC__ //{
  if ( access(Name,W_OK) == 0 )
  #else
  #ifdef _MSC_VER
--- 408,414 ----
  bool CheckAndChangeAccess(char * Name)
  {
  
! #if defined __WATCOMC__ || defined unix
  if ( access(Name,W_OK) == 0 )
  #else
  #ifdef _MSC_VER
Only in /usr/local/src/crblib~: codeutil.c
diff -c /usr/local/src/crblib~/crbeqlib.c /usr/local/src/crblib/crbeqlib.c
*** /usr/local/src/crblib~/crbeqlib.c	1999-11-02 10:21:02.000000000 -0500
--- /usr/local/src/crblib/crbeqlib.c	2004-06-07 17:39:37.000000000 -0400
***************
*** 98,104 ****
--- 98,106 ----
  
  #include <crblib/equtil.h>
  #include <crblib/crbconv.h>
+ #ifndef unix
  #include <crblib/floatutil.h>
+ #endif
  
  /*definitions*/
  
Only in /usr/local/src/crblib~: crbequtil.c
Only in /usr/local/src/crblib~: crblib.mak
Only in /usr/local/src/crblib~: farithc.c
Only in /usr/local/src/crblib~: farithc.h
Only in /usr/local/src/crblib~: fbitio.c
Only in /usr/local/src/crblib~: fbitio.h
diff -c /usr/local/src/crblib~/fileutil.c /usr/local/src/crblib/fileutil.c
*** /usr/local/src/crblib~/fileutil.c	2000-04-11 11:41:46.000000000 -0400
--- /usr/local/src/crblib/fileutil.c	2004-06-08 22:40:56.000000000 -0400
***************
*** 6,14 ****
--- 6,21 ----
  #include <crblib/inc.h>
  #include <crblib/strutil.h>
  #include <crblib/fileutil.h>
+ #ifndef unix
  #include <io.h>
+ #endif
  
+ #ifdef unix
+ #include <sys/types.h>
+ #include <utime.h>
+ #else
  #include <sys/utime.h>
+ #endif
  
  void dprintf(const char * String, ...)
  {
***************
*** 19,25 ****
      vsprintf(TempStr, String, ArgPtr);
  	va_end(ArgPtr);
  
! 	if ( isatty(_fileno(stdout)) )
  		printf(TempStr);
  	else
  	{
--- 26,32 ----
      vsprintf(TempStr, String, ArgPtr);
  	va_end(ArgPtr);
  
! 	if ( isatty(fileno(stdout)) )
  		printf(TempStr);
  	else
  	{
Only in /usr/local/src/crblib~: fileutio.c
Only in /usr/local/src/crblib~: floatutil.c
Only in /usr/local/src/crblib~: floatutil.h
diff -c /usr/local/src/crblib~/huffa.c /usr/local/src/crblib/huffa.c
*** /usr/local/src/crblib~/huffa.c	1999-03-13 03:07:52.000000000 -0500
--- /usr/local/src/crblib/huffa.c	2004-06-08 23:14:19.000000000 -0400
***************
*** 74,80 ****
  	if ( CurLen < BestLen ) { BestLen = CurLen; Type = HUFFA_TYPE_O0NB; }
  
  	if ( ! O1HuffArray(RawArray,RawLen,HuffArray,&CurLen,TRUE) ) return(0);
! 	
  	if ( CurLen < BestLen ) { BestLen = CurLen; Type = HUFFA_TYPE_O1; }
  
  	if ( Type == HUFFA_TYPE_O1 ) { } /* done */
--- 74,80 ----
  	if ( CurLen < BestLen ) { BestLen = CurLen; Type = HUFFA_TYPE_O0NB; }
  
  	if ( ! O1HuffArray(RawArray,RawLen,HuffArray,&CurLen,TRUE) ) return(0);
! 
  	if ( CurLen < BestLen ) { BestLen = CurLen; Type = HUFFA_TYPE_O1; }
  
  	if ( Type == HUFFA_TYPE_O1 ) { } /* done */
***************
*** 128,139 ****
  			break;
  		default:
  			CleanUp("Got invalid type flag");
! 			break;	
  		}
  
  	if ( CompressFlag )
  		*HuffArrayLenPtr = (*HuffArrayLenPtr) + 1;
! 	
  	return(success);
  	}
  
--- 128,139 ----
  			break;
  		default:
  			CleanUp("Got invalid type flag");
! 			break;
  		}
  
  	if ( CompressFlag )
  		*HuffArrayLenPtr = (*HuffArrayLenPtr) + 1;
! 
  	return(success);
  	}
  
***************
*** 507,513 ****
  
  	if ( ! O0HuffArrayBII_noblock(BlockArray,BlockLen,BII,1) )
  		CleanUp("o0_noblock failed");
!  
  	if ( ! O0HuffArrayBII_noblock(LitArray,NumLits,BII,1) )
  		CleanUp("o0_noblock failed");
  
--- 507,513 ----
  
  	if ( ! O0HuffArrayBII_noblock(BlockArray,BlockLen,BII,1) )
  		CleanUp("o0_noblock failed");
! 
  	if ( ! O0HuffArrayBII_noblock(LitArray,NumLits,BII,1) )
  		CleanUp("o0_noblock failed");
  
***************
*** 744,750 ****
  
  	mergePtr = o1Arrays[256];
  
! 	assert( _heapchk() == _HEAPOK );
  
  	for(lc=0;lc<256;lc++)
  	{
--- 744,750 ----
  
  	mergePtr = o1Arrays[256];
  
! /*	assert( _heapchk() == _HEAPOK ); */
  
  	for(lc=0;lc<256;lc++)
  	{
***************
*** 765,771 ****
  		{
  			o1ArrayLens[256] += len;
  			CurArray = o1Arrays[lc];
! 			while(len--) 
  				*mergePtr++ = *CurArray++;
  		}
  	}
--- 765,771 ----
  		{
  			o1ArrayLens[256] += len;
  			CurArray = o1Arrays[lc];
! 			while(len--)
  				*mergePtr++ = *CurArray++;
  		}
  	}
***************
*** 781,787 ****
  			CleanUp("O0HuffArrayBII failed")
  	}
  
! 	assert( _heapchk() == _HEAPOK );
  
  	assert( HuffArrayLenPtr );
  	*HuffArrayLenPtr = LBitIO_FlushWrite(BII);
--- 781,787 ----
  			CleanUp("O0HuffArrayBII failed")
  	}
  
! /*	assert( _heapchk() == _HEAPOK ); */
  
  	assert( HuffArrayLenPtr );
  	*HuffArrayLenPtr = LBitIO_FlushWrite(BII);
***************
*** 799,805 ****
  	{
  		if ( o1Arrays[lc] )
  		{
! 			assert( _heapchk() == _HEAPOK );
  			free( o1Arrays[lc] );
  		}
  	}
--- 799,805 ----
  	{
  		if ( o1Arrays[lc] )
  		{
! /*			assert( _heapchk() == _HEAPOK ); */
  			free( o1Arrays[lc] );
  		}
  	}
Only in /usr/local/src/crblib~: imutil.c
Only in /usr/local/src/crblib~: imutil.h
diff -c /usr/local/src/crblib~/inc.h /usr/local/src/crblib/inc.h
*** /usr/local/src/crblib~/inc.h	2002-01-27 15:25:56.000000000 -0500
--- /usr/local/src/crblib/inc.h	2004-06-08 22:32:51.000000000 -0400
***************
*** 2,9 ****
--- 2,11 ----
  #define CRB_INC_H
  
  /*types:*/
+ #ifndef _SYS_TYPES_H
  typedef unsigned int uint;
  typedef unsigned long  ulong;
+ #endif
  typedef unsigned short uword;
  typedef unsigned char  ubyte;
  typedef short word;
Only in /usr/local/src/crblib~: ladder.c
Only in /usr/local/src/crblib~: ladder.h
diff -c /usr/local/src/crblib~/lbitio.c /usr/local/src/crblib/lbitio.c
*** /usr/local/src/crblib~/lbitio.c	1999-06-15 12:22:32.000000000 -0400
--- /usr/local/src/crblib/lbitio.c	2004-06-08 23:25:50.000000000 -0400
***************
*** 178,181 ****
  		}
  		val ++;
  	}
! }
\ No newline at end of file
--- 178,181 ----
  		}
  		val ++;
  	}
! }
Only in /usr/local/src/crblib~: log.c
Only in /usr/local/src/crblib~: log.h
diff -c /usr/local/src/crblib~/mempool.c /usr/local/src/crblib/mempool.c
*** /usr/local/src/crblib~/mempool.c	2004-05-08 11:14:00.000000000 -0400
--- /usr/local/src/crblib/mempool.c	2004-06-08 22:34:13.000000000 -0400
***************
*** 278,281 ****
  	}
  	*pPool = NULL;
  	*pNumHunks = 0;
! }
\ No newline at end of file
--- 278,281 ----
  	}
  	*pPool = NULL;
  	*pNumHunks = 0;
! }
Only in /usr/local/src/crblib~: myassert.c
Only in /usr/local/src/crblib~: myassert.h
Only in /usr/local/src/crblib~: report.c
Only in /usr/local/src/crblib~: report.h
Only in /usr/local/src/crblib~: rungae.c
Only in /usr/local/src/crblib~: rungae.h
Only in /usr/local/src/crblib~: rungo1.c
Only in /usr/local/src/crblib~: rungo1.h
Only in /usr/local/src/crblib~: scontext.c
Only in /usr/local/src/crblib~: scontext.h
Only in /usr/local/src/crblib~: soz.c
Only in /usr/local/src/crblib~: soz.h
Only in /usr/local/src/crblib~: spawnmutil.c
Only in /usr/local/src/crblib~: spawnmutil.h
diff -c /usr/local/src/crblib~/timer.c /usr/local/src/crblib/timer.c
*** /usr/local/src/crblib~/timer.c	1999-10-04 00:28:04.000000000 -0400
--- /usr/local/src/crblib/timer.c	2004-06-08 18:52:24.000000000 -0400
***************
*** 1,7 ****
  #include "timer.h"
  #include <assert.h>
  
! FILE * timerFP = stdout;
  
  int timerCount = 0;
  
--- 1,7 ----
  #include "timer.h"
  #include <assert.h>
  
! /* FILE * timerFP = stdout; */
  
  int timerCount = 0;
  
diff -c /usr/local/src/crblib~/tsc.c /usr/local/src/crblib/tsc.c
*** /usr/local/src/crblib~/tsc.c	2004-05-08 22:14:10.000000000 -0400
--- /usr/local/src/crblib/tsc.c	2004-06-08 22:36:34.000000000 -0400
***************
*** 1,9 ****
--- 1,11 ----
  
  #include <crblib/inc.h>
  #include <time.h>
+ #ifndef unix
  #include <windows.h>
  
  #pragma comment(lib,"winmm.lib")
+ #endif
  
  #include "tsc.h"
  
***************
*** 147,152 ****
--- 149,155 ----
  #define TSC_REGISTRY_PATH	"SOFTWARE\\cbloom"
  #define TSC_REGISTRY_VAL	"tscMHZ"
  
+ #ifndef unix
  bool RegistryGetValue(const char * path,const char * file,int * pValue)
  {
  	HKEY hKey;
***************
*** 242,252 ****
  
  	return result;
  }
! 
  static double secondsPerClock = 0.0f;
  static bool haveSecondsPerClock = false;
  static int TSC_MHZ = 0;
  
  double secondsPerTSC(void)
  {
  double clocksPerSec,MHZ;
--- 245,305 ----
  
  	return result;
  }
! #endif
  static double secondsPerClock = 0.0f;
  static bool haveSecondsPerClock = false;
  static int TSC_MHZ = 0;
  
+ #ifdef unix
+ 
+ double secondsPerTSC(void)
+ {
+ clock_t clock1;
+ tsc_type tsc1,tsc2;
+ double clocksPerSec,MHZ;
+ 
+ 	if ( haveSecondsPerClock )
+ 	{
+ 		return secondsPerClock;
+ 	}
+ 
+ 	do
+ 	{
+ 
+ 		clock1 = clock();
+ 		readTSC(tsc1);
+ 		while( (clock() - clock1) < CLOCKS_PER_SEC ) ;
+ 		readTSC(tsc2);
+ 		clocksPerSec = diffTSChz(tsc1,tsc2);
+ 
+ 		MHZ = clocksPerSec / (1000000.0);
+ 
+ 		// check for common errors
+ 		{
+ 		int Z50,Z83;
+ 			Z50 = ((int)((MHZ + 25)/50))*50; // round to the nearest fifty
+ 			Z83 = ((int)(((MHZ + 41)*12)/1000))*1000/12; // round to the nearest 83.333 == 1000/12
+ 			if ( ABS((double)Z50 - MHZ) < 14 )
+ 				MHZ = Z50;
+ 			else if ( ABS((double)Z83 - MHZ) < 14 )
+ 				MHZ = Z83;
+ 			else
+ 			{
+ 				MHZ = ((int)((MHZ + 5)/10))*10; // round to the nearest ten
+ 			}
+ 			TSC_MHZ = (int) MHZ;
+ 		}
+ 
+ 	} while( TSC_MHZ > 1000 );
+ 
+ 	clocksPerSec  = MHZ * (1000000.0);
+ 
+ 	haveSecondsPerClock = true;
+ 	secondsPerClock = 1.0f / clocksPerSec;
+ 
+ return secondsPerClock;
+ }
+ #else
  double secondsPerTSC(void)
  {
  double clocksPerSec,MHZ;
***************
*** 315,321 ****
  
  return secondsPerClock;
  }
! 
  double timeTSC(void)
  {
  double time;
--- 368,374 ----
  
  return secondsPerClock;
  }
! #endif
  double timeTSC(void)
  {
  double time;
Only in /usr/local/src/crblib~: vqarith.c
Only in /usr/local/src/crblib~: vqarith.h
Only in /usr/local/src/crblib~: walker.c
Only in /usr/local/src/crblib~: walker.h

Diff finished at Wed Jun  9 00:18:50

cd /usr/local/src/crblib/
diff -c /usr/local/src/crblib\~/crblib.mak /usr/local/src/crblib/Makefile
*** /usr/local/src/crblib~/crblib.mak	1998-03-01 20:22:14.000000000 -0500
--- /usr/local/src/crblib/Makefile	2004-06-08 23:24:58.000000000 -0400
***************
*** 4,19 ****
  #
  # Build this before building in the "ppmz" directory.
  #
! SHELL		= /bin/sh
! CC			= gcc
! CFLAGS		= -O3 -Wall
! 
! INCLUDES	= -I.
! 
! OBJS		= arithc.o bbitio.o cacmari.o chshutil.o cindcatr.o crbconv.o \
! 			  crbeqlib.o crc32.o equtil.o context.o fileutil.o mtf.o o1coder.o \
! 			  huffman2.o lbitio.o matchpat.o mempool.o memutil.o huffa.o \
! 			  o0coder.o sortnods.o strutil.o timer.o runtrans.o dbf.o
  
  all: prep libcrb.a
  
--- 4,32 ----
  #
  # Build this before building in the "ppmz" directory.
  #
! SHELL	= /bin/sh
! CC	= gcc
! INCLUDES= -I..
! #CFLAGS	= -O3 -Wall
! CFLAGS	= -O3
! 
! SRCS	= tsc.h tsc.c timer.h timer.c strutil.h strutil.c sortnods.h	\
! 	  sortnods.c runtrans.h runtrans.c o1coder.h o1coder.c		\
! 	  o0coder.h o0coder.c mtf.h mtf.c memutil.h memutil.c		\
! 	  mempool.h mempool.c matchpat.h matchpat.c list.h list.c	\
! 	  lbitio.h lbitio.c intmath.h intmath.c huffman2.h huffman2.c	\
! 	  huffa.h huffa.c fileutil.h fileutil.c equtil.h equtil.c	\
! 	  dbf.c crc32.h crc32.c crbeqlib.h crbeqlib.c crbconv.h		\
! 	  crbconv.c context.h context.c cindcatr.h cindcatr.c		\
! 	  chshutil.h chshutil.c cacmari.h cacmari.c bbitio.h bbitio.c	\
! 	  arithc.h arithc.c inc.h arithc._h codeutil.h Makefile
! 
! OBJS	= arithc.o bbitio.o cacmari.o chshutil.o cindcatr.o crbconv.o \
! 	  crbeqlib.o crc32.o equtil.o context.o fileutil.o \
! 	  mtf.o o1coder.o huffman2.o intmath.o lbitio.o \
! 	  matchpat.o mempool.o memutil.o huffa.o o0coder.o \
! 	  sortnods.o strutil.o timer.o runtrans.o dbf.o \
! 	  list.o tsc.o
  
  all: prep libcrb.a
  
***************
*** 31,33 ****
--- 44,54 ----
  clean:
  	rm -f libcrb.a *.o core *~
  
+ dist:
+ 	-rm -rf temp
+ 	mkdir temp
+ 	mkdir temp/crblib
+ 	ln $(SRCS) temp/crblib/
+ 	-rm -f crblib2b1.zip
+ 	(cd temp; zip ../crblib2b1.zip -r crblib)
+ 	rm -rf temp

Diff finished at Wed Jun  9 00:23:35