patch for cdrom.c compilation problem under 2.1.9

Matthew Jacob (mjacob@feral.com)
Tue, 12 Nov 96 22:34:33 PST

Sorry if this has already been addressed- I don't recall seeing
it today tho...Ran into this on an alpha. Can't undef current
and expect GETARG to work.

--- linux/drivers/cdrom/cdrom.c.orig Tue Nov 12 22:36:15 1996
+++ linux/drivers/cdrom/cdrom.c Tue Nov 12 22:38:04 1996
@@ -268,13 +268,11 @@
meaningful format indicated above.
*/

-#undef current /* set in sched.h */
-
static
void sanitize_format(union cdrom_addr *addr,
- u_char * current, u_char requested)
+ u_char * cur, u_char requested)
{
- if (*current == requested)
+ if (*cur == requested)
return; /* nothing to be done! */
if (requested == CDROM_LBA) {
addr->lba = (int) addr->msf.frame +
@@ -287,7 +285,7 @@
addr->msf.second = lba % 60;
addr->msf.minute = lba / 60;
}
- *current = requested;
+ *cur = requested;
}

/* All checking and format change makes this code really hard to read!