diff -r mbuffer-20010621/CHANGES mbuffer-20010622/CHANGES
0a1,5
> 20010622:
> - architecture switches for x86 changed to match gcc-3.0
> - 64 Bit updates for huge data amounts
> - docu update
> 
diff -r mbuffer-20010621/README mbuffer-20010622/README
67a68,76
> 64 Bit Buffers:
> ===============
> The buffer limit is 2G x Blocksize. This limit is
> caused by the posix semaphore interface which is based on an
> int, which is on all architectures a 32 Bit word. So
> if you want to use realy huge buffers you need to set a
> huge blocksize.
> 
> 
diff -r mbuffer-20010621/configure mbuffer-20010622/configure
648c648
< VERSION=20010621
---
> VERSION=20010622
1141,1142c1141,1142
<                 CFLAGS="$CFLAGS -m386"
<                 CXXFLAGS="$CXXFLAGS -m386"
---
>                 CFLAGS="$CFLAGS -march=i386"
>                 CXXFLAGS="$CXXFLAGS -march=i386"
1145,1146c1145,1146
<                 CFLAGS="$CFLAGS -m486"
<                 CXXFLAGS="$CXXFLAGS -m486"
---
>                 CFLAGS="$CFLAGS -march=i486"
>                 CXXFLAGS="$CXXFLAGS -march=i486"
1149,1150c1149,1150
<                 CFLAGS="$CFLAGS -mpentium"
<                 CXXFLAGS="$CXXFLAGS -mpentium"
---
>                 CFLAGS="$CFLAGS -march=pentium"
>                 CXXFLAGS="$CXXFLAGS -march=pentium"
1153,1154c1153,1154
<                 CFLAGS="$CFLAGS -mpentiumpro"
<                 CXXFLAGS="$CXXFLAGS -mpentiumpro"
---
>                 CFLAGS="$CFLAGS -march=pentiumpro"
>                 CXXFLAGS="$CXXFLAGS -march=pentiumpro"
diff -r mbuffer-20010621/configure.in mbuffer-20010622/configure.in
12c12
< VERSION=20010621
---
> VERSION=20010622
33,34c33,34
<                 CFLAGS="$CFLAGS -m386"
<                 CXXFLAGS="$CXXFLAGS -m386"
---
>                 CFLAGS="$CFLAGS -march=i386"
>                 CXXFLAGS="$CXXFLAGS -march=i386"
37,38c37,38
<                 CFLAGS="$CFLAGS -m486"
<                 CXXFLAGS="$CXXFLAGS -m486"
---
>                 CFLAGS="$CFLAGS -march=i486"
>                 CXXFLAGS="$CXXFLAGS -march=i486"
41,42c41,42
<                 CFLAGS="$CFLAGS -mpentium"
<                 CXXFLAGS="$CXXFLAGS -mpentium"
---
>                 CFLAGS="$CFLAGS -march=pentium"
>                 CXXFLAGS="$CXXFLAGS -march=pentium"
45,46c45,46
<                 CFLAGS="$CFLAGS -mpentiumpro"
<                 CXXFLAGS="$CXXFLAGS -mpentiumpro"
---
>                 CFLAGS="$CFLAGS -march=pentiumpro"
>                 CXXFLAGS="$CXXFLAGS -march=pentiumpro"
diff -r mbuffer-20010621/mbuffer.c mbuffer-20010622/mbuffer.c
19,20c19,22
< int Verbose = 3, Finish = 0, In, Out, Tmp, Rest = 0, Numin = 0,
<     Numout = 0, Pause = 0, Memmap = 0, Status = 1, Outsize = 0;
---
> int Verbose = 3, Finish = 0, In, Out, Tmp, Rest = 0, Pause = 0, 
> 	Memmap = 0, Status = 1, Outsize = 0, Nooverwrite = O_EXCL, 
> 	Numblocks = 256;
> unsigned long long Blocksize = 10240, Numin = 0, Numout = 0;
24d25
< int Blocksize = 10240, Nooverwrite = O_EXCL, Numblocks = 256;
111,112c112,113
< 		fprintf(Terminal,"\nsummary: %i kB in %.1f sec - %.1f kB/sec average\n",
< 			(int) ((long long) Numout * Blocksize) >> 10,
---
> 		fprintf(Terminal,"\nsummary: %Lu kB in %.1f sec - %.1f kB/sec average\n",
> 			(Numout * Blocksize) >> 10,
134c135,136
< 	int total, rest, lin = 0, lout = 0;
---
> 	unsigned long long total, lin = 0, lout = 0;
> 	int rest;
153c155
< 		total = ((long long)Numout * Blocksize) >> 10;
---
> 		total = (Numout * Blocksize) >> 10;
155c157
< 		fprintf(Terminal,"\rin at %8.1f kB/sec - out at %8.1f kB/sec - %i kB totally transfered - buffer %3.0f%% full",in,out,total,fill);
---
> 		fprintf(Terminal,"\rin at %8.1f kB/sec - out at %8.1f kB/sec - %Lu kB totally transfered - buffer %3.0f%% full",in,out,total,fill);
171,172c173,174
< 	fprintf(Terminal,"summary: %i kB in %.1f sec - %.1f kB/sec average\n",
< 		(int) ((long long) Numout * Blocksize) >> 10,
---
> 	fprintf(Terminal,"summary: %Lu kB in %.1f sec - %.1f kB/sec average\n",
> 		(Numout * Blocksize) >> 10,
343c345
< 		"-s <size>  : use block of <size> bytes for buffer (default %i)\n"
---
> 		"-s <size>  : use block of <size> bytes for buffer (default %Lu)\n"
366c368
< int calcint(char **argv, int c, int d)
---
> unsigned long long calcint(char **argv, int c, unsigned long long d)
369c371
< 	int i;
---
> 	unsigned long long i;
371c373
< 	switch (sscanf(argv[c],"%i%c",&i,&ch)) {
---
> 	switch (sscanf(argv[c],"%Lu%c",&i,&ch)) {
406,407c408,409
< 	int c, totalmem = 0;
< 	int optMset = 0, optSset = 0, optBset = 0;
---
> 	unsigned long long totalmem = 0;
> 	int c, optMset = 0, optSset = 0, optBset = 0;
417c419
< 			debugmsg("Blocksize set to %i\n",Blocksize);
---
> 			debugmsg("Blocksize set to %Lu\n",Blocksize);
421c423
< 			debugmsg("totalmem set to %i\n",totalmem);
---
> 			debugmsg("totalmem set to %Lu\n",totalmem);
486a489,491
> 		if ((totalmem / Blocksize) >= (1 << 31))
> 			fatal("maximum number of managable blocks is %Li\n"
> 				"Try a bigger blocksize!\n",1 << 31);
491c496
< 		infomsg("blocksize set to %i\n",Blocksize);
---
> 		infomsg("blocksize set to %Lu\n",Blocksize);