Commit e1211e22 authored by Thomas Weißschuh's avatar Thomas Weißschuh
Browse files

tools/nolibc: move makedev() and friends to sys/sysmacros.h 



This is the location regular userspace expects these definitions.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Acked-by: default avatarWilly Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250515-nolibc-sys-v1-6-74f82eea3b59@weissschuh.net
parent 90895247

tools/include/nolibc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ all_files := \ 
		sys/resource.h \

		sys/stat.h \

		sys/syscall.h \

		sys/sysmacros.h \

		sys/time.h \

		sys/timerfd.h \

		sys/types.h \

tools/include/nolibc/nolibc.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 
#include "sys/resource.h"

#include "sys/stat.h"

#include "sys/syscall.h"

#include "sys/sysmacros.h"

#include "sys/time.h"

#include "sys/timerfd.h"

#include "sys/wait.h"

tools/include/nolibc/sys/sysmacros.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: LGPL-2.1 OR MIT */

/*

 * Sysmacro definitions for NOLIBC

 * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>

 */



/* make sure to include all global symbols */

#include "../nolibc.h"



#ifndef _NOLIBC_SYS_SYSMACROS_H

#define _NOLIBC_SYS_SYSMACROS_H



#include "../std.h"



/* WARNING, it only deals with the 4096 first majors and 256 first minors */

#define makedev(major, minor) ((dev_t)((((major) & 0xfff) << 8) | ((minor) & 0xff)))

#define major(dev) ((unsigned int)(((dev) >> 8) & 0xfff))

#define minor(dev) ((unsigned int)((dev) & 0xff))



#endif /* _NOLIBC_SYS_SYSMACROS_H */

tools/include/nolibc/types.h

+0 −5
Original line number Diff line number Diff line
@@ -188,11 +188,6 @@ struct stat { 
typedef __kernel_clockid_t clockid_t;

typedef int timer_t;



/* WARNING, it only deals with the 4096 first majors and 256 first minors */

#define makedev(major, minor) ((dev_t)((((major) & 0xfff) << 8) | ((minor) & 0xff)))

#define major(dev) ((unsigned int)(((dev) >> 8) & 0xfff))

#define minor(dev) ((unsigned int)((dev) & 0xff))



#ifndef offsetof

#define offsetof(TYPE, FIELD) ((size_t) &((TYPE *)0)->FIELD)

#endif