From 0b178f043679cbdfa8e2aaf4362b5be61fca4e7a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 10 Jan 2003 15:02:52 +0000 Subject: 2003-01-10 Joel Sherrill * include/rtems/libio.h: Rename __dev_t to __rtems_dev_t to avoid conflict with GNU/Linux header files. --- cpukit/libcsupport/ChangeLog | 5 +++++ cpukit/libcsupport/include/rtems/libio.h | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'cpukit/libcsupport') diff --git a/cpukit/libcsupport/ChangeLog b/cpukit/libcsupport/ChangeLog index 049cb11bdc..7c76485ba6 100644 --- a/cpukit/libcsupport/ChangeLog +++ b/cpukit/libcsupport/ChangeLog @@ -1,3 +1,8 @@ +2003-01-10 Joel Sherrill + + * include/rtems/libio.h: Rename __dev_t to __rtems_dev_t to avoid + conflict with GNU/Linux header files. + 2003-01-03 Till Straumann * ChangeLog, base_fs.c, getpwent.c, privateenv.c diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h index df46f26956..de41d6388f 100644 --- a/cpukit/libcsupport/include/rtems/libio.h +++ b/cpukit/libcsupport/include/rtems/libio.h @@ -468,7 +468,7 @@ typedef int (*rtems_libio_lseek_t)( #include -union __dev_t { +union __rtems_dev_t { dev_t device; struct { rtems_device_major_number major; @@ -481,7 +481,7 @@ static inline dev_t rtems_filesystem_make_dev_t( rtems_device_minor_number _minor ) { - union __dev_t temp; + union __rtems_dev_t temp; temp.__overlay.major = _major; temp.__overlay.minor = _minor; @@ -492,7 +492,7 @@ static inline rtems_device_major_number rtems_filesystem_dev_major_t( dev_t device ) { - union __dev_t temp; + union __rtems_dev_t temp; temp.device = device; return temp.__overlay.major; @@ -503,7 +503,7 @@ static inline rtems_device_minor_number rtems_filesystem_dev_minor_t( dev_t device ) { - union __dev_t temp; + union __rtems_dev_t temp; temp.device = device; return temp.__overlay.minor; -- cgit v1.2.3