Re: cdwrite-2.0 patches for axp

Zarmfab Software Development (fabsoft@fabsoft2.zarm.uni-bremen.de)
Fri, 15 Nov 1996 15:28:49 +0100

Oops, i forgot to include the patch, hereit is:

------ snip ----------

diff -u -r -P cdwrite-2.0/Makefile cdwrite-2.0-axp/Makefile
--- cdwrite-2.0/Makefile Tue Nov 21 02:56:38 1995
+++ cdwrite-2.0-axp/Makefile Fri Nov 15 13:56:28 1996
@@ -1,8 +1,8 @@
PROGS= cdwrite isosize
LINUX= /usr/src/linux
-CFLAGS= -Wall -O2 -fomit-frame-pointer -ansi -pedantic -I $(LINUX)/include -I $(LINUX)/drivers
+CFLAGS= -Wall -O2 -fomit-frame-pointer -I $(LINUX)/include -I $(LINUX)/drivers
LDFLAGS= -s
-BINDIR= /usr/bin
+BINDIR= /usr/local/bin

all: $(PROGS)

diff -u -r -P cdwrite-2.0/cdwrite.c cdwrite-2.0-axp/cdwrite.c
--- cdwrite-2.0/cdwrite.c Tue Nov 21 02:58:51 1995
+++ cdwrite-2.0-axp/cdwrite.c Fri Nov 15 13:43:40 1996
@@ -35,17 +35,27 @@
#include <sys/file.h>
#include <sys/errno.h>
#include <sys/time.h>
+#ifdef __alpha
+#include "fixup_res.h"
+#endif
#include <sys/resource.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <limits.h>
+#include <asm/param.h>
+#ifndef HZ
+#define HZ __KERNEL_HZ
+#endif

#include <linux/version.h>
#ifndef LINUX_VERSION_CODE /* Very old kernel? */
#define LINUX_VERSION_CODE 0
#endif
+#if LINUX_VERSION_CODE >= 0x020000 /* <scsi/scsi.h> introduced in 2.0 ?? */
+#include <scsi/scsi.h>
+#else
#if LINUX_VERSION_CODE >= 0x01031a /* <linux/scsi.h> introduced in 1.3.26 */
#include <linux/scsi.h>
#else
@@ -55,7 +65,9 @@
#include "block/blk.h"
#include "scsi/scsi.h"
#endif
-#include "scsi/sg.h"
+#endif
+
+#include <scsi/sg.h>

#include <string.h>

@@ -934,7 +946,7 @@
int reply_len;
int speed_factor = 0;
int dummy_write = 0;
- unsigned long timeout = 10 * 60 * 100;
+ unsigned long timeout = 10 * 60 * HZ;
/* default timeout = 1 minute, but it */
/* takes slightly longer than that to */
/* write the leadin and leadout. (The */
diff -u -r -P cdwrite-2.0/fixup_res.h cdwrite-2.0-axp/fixup_res.h
--- cdwrite-2.0/fixup_res.h Thu Jan 1 01:00:00 1970
+++ cdwrite-2.0-axp/fixup_res.h Fri Nov 15 12:37:17 1996
@@ -0,0 +1,35 @@
+#include <asm/resource.h>
+
+#ifndef RLIMIT_CPU
+#define RLIMIT_CPU __KERNEL_RLIMIT_CPU
+#endif
+#ifndef RLIMIT_FSIZE
+#define RLIMIT_FSIZE __KERNEL_RLIMIT_FSIZE
+#endif
+#ifndef RLIMIT_DATA
+#define RLIMIT_DATA __KERNEL_RLIMIT_DATA
+#endif
+#ifndef RLIMIT_STACK
+#define RLIMIT_STACK __KERNEL_RLIMIT_STACK
+#endif
+#ifndef RLIMIT_CORE
+#define RLIMIT_CORE __KERNEL_RLIMIT_CORE
+#endif
+#ifndef RLIMIT_RSS
+#define RLIMIT_RSS __KERNEL_RLIMIT_RSS
+#endif
+#ifndef RLIMIT_NOFILE
+#define RLIMIT_NOFILE __KERNEL_RLIMIT_NOFILE
+#endif
+#ifndef RLIMIT_AS
+#define RLIMIT_AS __KERNEL_RLIMIT_AS
+#endif
+#ifndef RLIMIT_NPROC
+#define RLIMIT_NPROC __KERNEL_RLIMIT_NPROC
+#endif
+#ifndef RLIMIT_MEMLOCK
+#define RLIMIT_MEMLOCK __KERNEL_RLIMIT_MEMLOCK
+#endif
+#ifndef RLIM_NLIMITS
+#define RLIM_NLIMITS __KERNEL_RLIM_NLIMITS
+#endif

------ snip ----------

-- 
Martin Cornelius, ZARMFAB software development, University of Bremen
phone: 49-421-218-4807    FAX: 49-421-218-3889
email: fabsoft@zarm.uni-bremen.de
paper-mail: Hochschulring / Am Fallturm, 28359 BREMEN, Germany

--
To unsubscribe: send e-mail to axp-list-request@redhat.com with
'unsubscribe' as the subject.  Do not send it to axp-list@redhat.com



Feedback | Store | News | Support | Product Errata | About Us | Linux Info | Search | JumpWords
No Frames | Show Frames

Copyright © 1995-1997 Red Hat Software. Legal notices