fixes to include major() and minor() in system header files (in a different

file than sys/types.h)

small binpackage update

diff --git a/commands/scripts/binpackage.sh b/commands/scripts/binpackage.sh
index 28c29c7e6bab19f2e58442a88a59299903636aad..71eee8d55d914e5c8dd253d5e82ceeeb57272bcb 100644 (file)
--- a/commands/scripts/binpackage.sh
+++ b/commands/scripts/binpackage.sh
@@ -4,6 +4,11 @@ set -e
 
 dir=$1
 
+if [ $# -lt 1 ]
+then   echo "Usage: $0 packagedir"
+       exit 1
+fi
+
 if [ ! -d "$dir" ]
 then   echo "Error: $dir isn't a directory."
        exit 1
@@ -21,6 +26,12 @@ binsizes big
 touch $packagestart
 sleep 1
 cd $dir
+
+if [ ! -f build ]
+then   echo "Error: No build script in $dir."
+       exit 1
+fi
+
 sh build
 cd /
 echo " * Making file index, writing $targz"

diff --git a/commands/simple/mkproto.c b/commands/simple/mkproto.c
index 09ce30030eebda9b7497ebf632735fafb241440e..b40d26ba99c811160ac796110f6291036b7c034e 100755 (executable)
--- a/commands/simple/mkproto.c
+++ b/commands/simple/mkproto.c
@@ -19,8 +19,10 @@
 #define DEF_INODES     63
 #define DEF_INDENTSTR  "\t"
 
+#ifndef major
 #define major(x) ( (x>>8) & 0377)
 #define minor(x) (x & 0377)
+#endif
 
 /* Globals. */
 int count, origlen, tabs;

diff --git a/include/minix/const.h b/include/minix/const.h
index 6c9e1792acb5d60ee5b64e506bccb905e7c2c41c..c0639180a28e35d2c61fcda0d4e5d4fb74c802ae 100755 (executable)
--- a/include/minix/const.h
+++ b/include/minix/const.h
@@ -18,10 +18,6 @@
 
 #define SUPER_USER (uid_t) 0   /* uid_t of superuser */
 
-/* Devices. */
-#define MAJOR             8    /* major device = (dev>>MAJOR) & 0377 */
-#define MINOR             0    /* minor device = (dev>>MINOR) & 0377 */
-
 #define NULL     ((void *)0)   /* null pointer */
 #define CPVEC_NR          16   /* max # of entries in a SYS_VCOPY request */
 #define CPVVEC_NR         64   /* max # of entries in a SYS_VCOPY request */

diff --git a/include/sys/types.h b/include/sys/types.h
index e8415a9039138247644f7640489e650e77d2aada..6c222f25cd722bb5ace667997d49a588ab491977 100755 (executable)
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -126,9 +126,19 @@ typedef unsigned int       u_int;
 typedef unsigned long  u_long;
 typedef char           *caddr_t;
 
+/* Devices. */   
+#define MAJOR              8    /* major device = (dev>>MAJOR) & 0377 */
+#define MINOR              0    /* minor device = (dev>>MINOR) & 0377 */
+
+#ifndef minor
+#define minor(dev)      (((dev) >> MINOR) & 0xff)
+#endif
+
+#ifndef major
+#define major(dev)      (((dev) >> MAJOR) & 0xff)
+#endif
+
 #ifndef makedev
-#define minor(dev)      (((dev) >> MINOR) & BYTE)
-#define major(dev)      (((dev) >> MAJOR) & BYTE)
 #define makedev(major, minor)   \
                         ((dev_t) (((major) << MAJOR) | ((minor) << MINOR)))
 #endif