From 4edff48607c4afe7a2f6ef387e3fcf773aa8957b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 25 Jan 2005 21:23:29 +0000 Subject: [PATCH] We still have to be binary compatible when we build for Haiku. Cleanup. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11041 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/posix/sys/utsname.h | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/headers/posix/sys/utsname.h b/headers/posix/sys/utsname.h index 4c151f84dc..b6f46f8ab3 100644 --- a/headers/posix/sys/utsname.h +++ b/headers/posix/sys/utsname.h @@ -1,35 +1,30 @@ /* - * - * Copyright 2004, Haiku Inc. All Rights Reserved. + * Copyright 2004-2005, Haiku Inc. All Rights Reserved. * Distributed under the terms of the MIT License. */ - #ifndef _SYS_UTSNAME_H #define _SYS_UTSNAME_H -#ifdef __HAIKU__ -#define _SYS_NAMELEN 256 -#else -#define _SYS_NAMELEN 32 // R5 compatibility -#endif + +#define _SYS_NAMELEN 32 + +struct utsname { + char sysname[_SYS_NAMELEN]; /* Name of the OS */ + char nodename[_SYS_NAMELEN]; /* Name of this node (network related) */ + char release[_SYS_NAMELEN]; /* Current release level */ + char version[_SYS_NAMELEN]; /* Current version level */ + char machine[_SYS_NAMELEN]; /* Name of the hardware type */ +}; + #ifdef __cplusplus extern "C" { #endif -struct utsname { - char sysname[_SYS_NAMELEN]; /* Name of the OS */ - char nodename[_SYS_NAMELEN]; /* Name of this node (network related) */ - char release[_SYS_NAMELEN]; /* Current release level */ - char version[_SYS_NAMELEN]; /* Current version level */ - char machine[_SYS_NAMELEN]; /* Name of the hardware type */ -}; - int uname(struct utsname *); #ifdef __cplusplus } #endif -#endif - +#endif /* _SYS_UTSNAME_H */