[Compile Regression in 2.4.25-pre8][PATCH 13/42]

Kronos
2004-02-02T21:04:51Z

tipar.c:76:1: warning: "minor" redefined
include/linux/kdev_t.h:81:1: warning: this is the location of the previous definition

Don't redefine 'minor' macro.

diff -Nru -X dontdiff linux-2.4-vanilla/drivers/char/tipar.c linux-2.4/drivers/char/tipar.c
--- linux-2.4-vanilla/drivers/char/tipar.c Fri Jun 13 16:51:33 2003
+++ linux-2.4/drivers/char/tipar.c Sat Jan 31 17:16:42 2004
@@ -73,7 +73,9 @@

#define VERSION(ver,rel,seq) (((ver)<<16) | ((rel)<<8) | (seq))
#if LINUX_VERSION_CODE < VERSION(2,5,0)
-# define minor(x) MINOR(x)
+# ifndef minor
+# define minor(x) MINOR(x)
+# endif
# define need_resched() (current->need_resched)
#endif

--
Reply-To: kronos@kronoz.cjb.net
Home: http://kronoz.cjb.net
"L'abilita` politica e` l'abilita` di prevedere quello che
accadra` domani, la prossima settimana, il prossimo mese e
l'anno prossimo. E di essere cosi` abili, piu` tardi,
da spiegare perche' non e` accaduto."