From 3974b578e80c12f8175f42d4a6a55ed7691aefa7 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 6 Feb 2004 07:07:16 +0000 Subject: Sigh. The 2.6.x kernel removed '__kernel_dev_t' and renamed it as '__kernel_old_dev_t'. And of course there is no good way to know which is in use except checking linux/version.h. Grumble. This is rather lame, but for now, define __kernel_old_dev_t to be the same as __kernel_dev_t. This will want to be revisited soon. -Erik --- libc/sysdeps/linux/alpha/bits/kernel_types.h | 1 + libc/sysdeps/linux/arm/bits/kernel_types.h | 1 + libc/sysdeps/linux/cris/bits/kernel_types.h | 1 + libc/sysdeps/linux/e1/bits/kernel_types.h | 1 + libc/sysdeps/linux/h8300/bits/kernel_types.h | 1 + libc/sysdeps/linux/i386/bits/kernel_types.h | 1 + libc/sysdeps/linux/m68k/bits/kernel_types.h | 1 + libc/sysdeps/linux/microblaze/bits/kernel_types.h | 1 + libc/sysdeps/linux/mips/bits/kernel_types.h | 2 ++ libc/sysdeps/linux/powerpc/bits/kernel_types.h | 2 ++ libc/sysdeps/linux/sh/bits/kernel_types.h | 1 + libc/sysdeps/linux/sh64/bits/kernel_types.h | 1 + libc/sysdeps/linux/sparc/bits/kernel_types.h | 2 ++ libc/sysdeps/linux/v850/bits/kernel_types.h | 1 + 14 files changed, 17 insertions(+) (limited to 'libc/sysdeps/linux') diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h index 0a4d63f87..01d2a8be0 100644 --- a/libc/sysdeps/linux/alpha/bits/kernel_types.h +++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h @@ -32,6 +32,7 @@ typedef __kernel_uid_t __kernel_old_uid_t; typedef __kernel_gid_t __kernel_old_gid_t; typedef __kernel_uid_t __kernel_uid32_t; typedef __kernel_gid_t __kernel_gid32_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef struct { int val[2]; diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h index ea8a3efad..d7a1b1530 100644 --- a/libc/sysdeps/linux/arm/bits/kernel_types.h +++ b/libc/sysdeps/linux/arm/bits/kernel_types.h @@ -31,6 +31,7 @@ typedef unsigned int __kernel_gid32_t; typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; typedef long long __kernel_loff_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef struct { #ifdef __USE_ALL diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h index e5cdacc7b..f3807acb0 100644 --- a/libc/sysdeps/linux/cris/bits/kernel_types.h +++ b/libc/sysdeps/linux/cris/bits/kernel_types.h @@ -27,6 +27,7 @@ typedef unsigned int __kernel_gid32_t; typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; #ifdef __GNUC__ typedef long long __kernel_loff_t; diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h index 129455412..513009d8f 100644 --- a/libc/sysdeps/linux/e1/bits/kernel_types.h +++ b/libc/sysdeps/linux/e1/bits/kernel_types.h @@ -30,6 +30,7 @@ typedef unsigned int __kernel_uid32_t; typedef unsigned int __kernel_gid32_t; typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef long long __kernel_loff_t; /* diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h index 4f5f2864f..ad0c08271 100644 --- a/libc/sysdeps/linux/h8300/bits/kernel_types.h +++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h @@ -31,6 +31,7 @@ typedef unsigned int __kernel_gid32_t; typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; #ifdef __GNUC__ typedef long long __kernel_loff_t; diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h index 4076e2674..efeb01b03 100644 --- a/libc/sysdeps/linux/i386/bits/kernel_types.h +++ b/libc/sysdeps/linux/i386/bits/kernel_types.h @@ -30,6 +30,7 @@ typedef unsigned int __kernel_uid32_t; typedef unsigned int __kernel_gid32_t; typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef long long __kernel_loff_t; typedef struct { diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h index e286305b5..166b33fe6 100644 --- a/libc/sysdeps/linux/m68k/bits/kernel_types.h +++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h @@ -31,6 +31,7 @@ typedef unsigned int __kernel_gid32_t; typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; typedef long long __kernel_loff_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef struct { #ifdef __USE_ALL diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h index ad08e7dab..1ca2dae30 100644 --- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h +++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h @@ -42,6 +42,7 @@ typedef unsigned int __kernel_gid32_t; typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef struct { #ifdef __USE_ALL diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h index 39b6a41d2..3605b1644 100644 --- a/libc/sysdeps/linux/mips/bits/kernel_types.h +++ b/libc/sysdeps/linux/mips/bits/kernel_types.h @@ -31,6 +31,7 @@ typedef int __kernel_uid32_t; typedef int __kernel_gid32_t; typedef __kernel_uid_t __kernel_old_uid_t; typedef __kernel_gid_t __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef long long __kernel_loff_t; #else typedef unsigned int __kernel_dev_t; @@ -66,6 +67,7 @@ typedef int __kernel_uid32_t; typedef int __kernel_gid32_t; typedef __kernel_uid_t __kernel_old_uid_t; typedef __kernel_gid_t __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef long long __kernel_loff_t; #endif diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h index 1c8c5e77a..711ca4f21 100644 --- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h +++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h @@ -33,6 +33,7 @@ typedef unsigned int __kernel_uid32_t; typedef unsigned int __kernel_gid32_t; typedef unsigned int __kernel_old_uid_t; typedef unsigned int __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; #else typedef unsigned int __kernel_dev_t; typedef unsigned int __kernel_ino_t; @@ -57,6 +58,7 @@ typedef unsigned int __kernel_uid32_t; typedef unsigned int __kernel_gid32_t; typedef unsigned int __kernel_old_uid_t; typedef unsigned int __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef long long __kernel_loff_t; #endif diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h index 0ce21d65b..baccd305e 100644 --- a/libc/sysdeps/linux/sh/bits/kernel_types.h +++ b/libc/sysdeps/linux/sh/bits/kernel_types.h @@ -30,6 +30,7 @@ typedef unsigned int __kernel_uid32_t; typedef unsigned int __kernel_gid32_t; typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef long long __kernel_loff_t; typedef struct { diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h index e4340eb60..2e160fcac 100644 --- a/libc/sysdeps/linux/sh64/bits/kernel_types.h +++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h @@ -42,6 +42,7 @@ typedef unsigned int __kernel_uid32_t; typedef unsigned int __kernel_gid32_t; typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef long long __kernel_loff_t; typedef struct { diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h index 91546e86d..3db603fc7 100644 --- a/libc/sysdeps/linux/sparc/bits/kernel_types.h +++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h @@ -30,6 +30,7 @@ typedef unsigned short __kernel_uid16_t; typedef unsigned short __kernel_gid16_t; typedef __kernel_uid_t __kernel_old_uid_t; typedef __kernel_gid_t __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef __kernel_uid_t __kernel_uid32_t; typedef __kernel_gid_t __kernel_gid32_t; typedef int __kernel_suseconds_t; @@ -59,6 +60,7 @@ typedef unsigned int __kernel_uid32_t; typedef unsigned int __kernel_gid32_t; typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef long long __kernel_loff_t; #endif diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h index f066ea549..3e851ab7b 100644 --- a/libc/sysdeps/linux/v850/bits/kernel_types.h +++ b/libc/sysdeps/linux/v850/bits/kernel_types.h @@ -40,6 +40,7 @@ typedef unsigned int __kernel_gid32_t; typedef unsigned short __kernel_old_uid_t; typedef unsigned short __kernel_old_gid_t; +typedef __kernel_dev_t __kernel_old_dev_t; typedef struct { #ifdef __USE_ALL -- cgit v1.2.3