mirror of
https://sourceware.org/git/glibc.git
synced 2025-12-24 17:51:17 +03:00
Update.
* sysdeps/unix/sysv/linux/sys/sysmacros.h: Pretty print. * sysdeps/unix/sysv/linux/Dist: Remove sys/sysmacros.h. * sysdeps/unix/sysv/linux/Makefile: Remove sys/sysmacros.h. * posix/Makefile (headers): Add sys/sysmacros.h. * posix/sys/types.h: Include sys/sysmacros.h for __USE_BSD. * sysdeps/generic/sys/sysmacros.h: New file. * sysdeps/mach/hurd/xmknod.c: Include sys/types.h and remove minor and major definition.
This commit is contained in:
31
sysdeps/generic/sys/sysmacros.h
Normal file
31
sysdeps/generic/sys/sysmacros.h
Normal file
@@ -0,0 +1,31 @@
|
||||
/* Definitions of macros to access `dev_t' values.
|
||||
Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#ifndef _SYS_SYSMACROS_H
|
||||
#define _SYS_SYSMACROS_H 1
|
||||
|
||||
/* For compatibility we provide alternative names.
|
||||
|
||||
The problem here is that compilers other than GCC probably don't
|
||||
have the `long long' type and so `dev_t' is actually an array. */
|
||||
#define major(dev) ((int)(((unsigned int) (dev) >> 8) & 0xff))
|
||||
#define minor(dev) ((int)((dev) & 0xff))
|
||||
#define makedev(major, minor) (((major) << 8) | (minor))
|
||||
|
||||
#endif /* sys/sysmacros.h */
|
||||
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1991, 92, 93, 94, 95, 96, 99 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
@@ -23,10 +23,7 @@
|
||||
#include <fcntl.h>
|
||||
#include "stdio-common/_itoa.h"
|
||||
#include <string.h>
|
||||
|
||||
/* Temporary hack; this belongs in a header file, probably types.h. */
|
||||
#define major(x) ((int)(((unsigned int) (x) >> 8) & 0xff))
|
||||
#define minor(x) ((int)((x) & 0xff))
|
||||
#include <sys/types.h>
|
||||
|
||||
|
||||
/* Create a device file named FILE_NAME, with permission and special bits MODE
|
||||
|
||||
@@ -13,7 +13,7 @@ sysdep_routines += sysctl clone llseek getresuid getresgid umount umount2
|
||||
|
||||
sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h sys/mtio.h \
|
||||
sys/io.h sys/klog.h sys/kdaemon.h \
|
||||
sys/user.h sys/sysmacros.h sys/procfs.h sys/prctl.h \
|
||||
sys/user.h sys/procfs.h sys/prctl.h \
|
||||
sys/kd.h sys/soundcard.h sys/vt.h \
|
||||
sys/quota.h sys/fsuid.h \
|
||||
scsi/sg.h scsi/scsi.h sys/pci.h sys/ultrasound.h \
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/* Definitions of macros to access `dev_t' values.
|
||||
Copyright (C) 1996, 1997 Free Software Foundation, Inc.
|
||||
Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
@@ -18,7 +18,6 @@
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#ifndef _SYS_SYSMACROS_H
|
||||
|
||||
#define _SYS_SYSMACROS_H 1
|
||||
|
||||
/* For compatibility we provide alternative names.
|
||||
@@ -35,4 +34,4 @@
|
||||
# define makedev(major, minor) { (((major) << 8) | (minor)), 0 }
|
||||
#endif
|
||||
|
||||
#endif /* _SYS_SYSMACROS_H */
|
||||
#endif /* sys/sysmacros.h */
|
||||
|
||||
Reference in New Issue
Block a user