RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2003-01-10 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* include/rtems/libio.h: Rename __dev_t to __rtems_dev_t to avoid
	conflict with GNU/Linux header files.
This commit is contained in:
Joel Sherrill
2003-01-10 15:02:52 +00:00
parent 7ab11c06b4
commit 0b178f0436
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cpukit/libcsupport/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-01-10 Joel Sherrill <joel@OARcorp.com>
* include/rtems/libio.h: Rename __dev_t to __rtems_dev_t to avoid
conflict with GNU/Linux header files.
2003-01-03 Till Straumann <strauman@slac.stanford.edu> 2003-01-03 Till Straumann <strauman@slac.stanford.edu>
* ChangeLog, base_fs.c, getpwent.c, privateenv.c * ChangeLog, base_fs.c, getpwent.c, privateenv.c

8
cpukit/libcsupport/include/rtems/libio.h
View File

@@ -468,7 +468,7 @@ typedef int (*rtems_libio_lseek_t)(
#include <unistd.h> #include <unistd.h>
union __dev_t { union __rtems_dev_t {
dev_t device; dev_t device;
struct { struct {
rtems_device_major_number major; rtems_device_major_number major;
@@ -481,7 +481,7 @@ static inline dev_t rtems_filesystem_make_dev_t(
rtems_device_minor_number _minor rtems_device_minor_number _minor
) )
{ {
union __dev_t temp; union __rtems_dev_t temp;
temp.__overlay.major = _major; temp.__overlay.major = _major;
temp.__overlay.minor = _minor; temp.__overlay.minor = _minor;
@@ -492,7 +492,7 @@ static inline rtems_device_major_number rtems_filesystem_dev_major_t(
dev_t device dev_t device
) )
{ {
union __dev_t temp; union __rtems_dev_t temp;
temp.device = device; temp.device = device;
return temp.__overlay.major; return temp.__overlay.major;
@@ -503,7 +503,7 @@ static inline rtems_device_minor_number rtems_filesystem_dev_minor_t(
dev_t device dev_t device
) )
{ {
union __dev_t temp; union __rtems_dev_t temp;
temp.device = device; temp.device = device;
return temp.__overlay.minor; return temp.__overlay.minor;