Skip to content

[libc] Use relative inclusion for public headers. #114324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 1, 2024
Merged

[libc] Use relative inclusion for public headers. #114324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42accef
[libc] Use relative inclusion for public headers.
lntue Oct 30, 2024
cdac39a
Update libc/include/llvm-libc-types/fd_set.h
lntue Nov 1, 2024
8200f0e
Update libc/include/llvm-libc-types/sigset_t.h
lntue Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libc/include/gpu/rpc.h.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "__llvm-libc-common.h"

#include "llvm-libc-types/rpc_opcodes_t.h"
#include "../llvm-libc-types/rpc_opcodes_t.h"

%%public_api()

Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-macros/containerof-macro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_MACROS_CONTAINEROF_MACRO_H
#define LLVM_LIBC_MACROS_CONTAINEROF_MACRO_H

#include "llvm-libc-macros/offsetof-macro.h"
#include "offsetof-macro.h"

#define __containerof(ptr, type, member) \
({ \
Expand Down
4 changes: 2 additions & 2 deletions libc/include/llvm-libc-macros/sys-queue-macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_MACROS_SYS_QUEUE_MACROS_H
#define LLVM_LIBC_MACROS_SYS_QUEUE_MACROS_H

#include "llvm-libc-macros/containerof-macro.h"
#include "llvm-libc-macros/null-macro.h"
#include "containerof-macro.h"
#include "null-macro.h"

#ifdef __cplusplus
#define QUEUE_TYPEOF(type) type
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/__mutex_type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES___MUTEX_TYPE_H
#define LLVM_LIBC_TYPES___MUTEX_TYPE_H

#include "llvm-libc-types/__futex_word.h"
#include "__futex_word.h"

typedef struct {
unsigned char __timed;
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/cnd_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_CND_T_H
#define LLVM_LIBC_TYPES_CND_T_H

#include "llvm-libc-types/__futex_word.h"
#include "__futex_word.h"

typedef struct {
void *__qfront;
Expand Down
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-types/cookie_io_functions_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#ifndef LLVM_LIBC_TYPES_COOKIE_IO_FUNCTIONS_T_H
#define LLVM_LIBC_TYPES_COOKIE_IO_FUNCTIONS_T_H

#include "llvm-libc-types/off64_t.h"
#include "llvm-libc-types/size_t.h"
#include "llvm-libc-types/ssize_t.h"
#include "off64_t.h"
#include "size_t.h"
#include "ssize_t.h"

typedef ssize_t cookie_read_function_t(void *, char *, size_t);
typedef ssize_t cookie_write_function_t(void *, const char *, size_t);
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/fd_set.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_FD_SET_H
#define LLVM_LIBC_TYPES_FD_SET_H

#include "llvm-libc-macros/sys-select-macros.h" // FD_SETSIZE
#include "../llvm-libc-macros/sys-select-macros.h" // __FD_SET_WORD_TYPE, __FD_SET_ARRAYSIZE

typedef struct {
__FD_SET_WORD_TYPE __set[__FD_SET_ARRAYSIZE];
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/mtx_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_MTX_T_H
#define LLVM_LIBC_TYPES_MTX_T_H

#include "llvm-libc-types/__mutex_type.h"
#include "__mutex_type.h"

typedef __mutex_type mtx_t;

Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/once_flag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_ONCE_FLAG_H
#define LLVM_LIBC_TYPES_ONCE_FLAG_H

#include "llvm-libc-types/__futex_word.h"
#include "__futex_word.h"

#ifdef __linux__
typedef __futex_word once_flag;
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/pthread_attr_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_PTHREAD_ATTR_T_H
#define LLVM_LIBC_TYPES_PTHREAD_ATTR_T_H

#include "llvm-libc-types/size_t.h"
#include "size_t.h"

typedef struct {
int __detachstate;
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/pthread_mutex_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_PTHREAD_MUTEX_T_H
#define LLVM_LIBC_TYPES_PTHREAD_MUTEX_T_H

#include "llvm-libc-types/__mutex_type.h"
#include "__mutex_type.h"

typedef __mutex_type pthread_mutex_t;

Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/pthread_once_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_PTHREAD_ONCE_T_H
#define LLVM_LIBC_TYPES_PTHREAD_ONCE_T_H

#include "llvm-libc-types/__futex_word.h"
#include "__futex_word.h"

#ifdef __linux__
typedef __futex_word pthread_once_t;
Expand Down
4 changes: 2 additions & 2 deletions libc/include/llvm-libc-types/pthread_rwlock_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TYPES_PTHREAD_RWLOCK_T_H
#define LLVM_LIBC_TYPES_PTHREAD_RWLOCK_T_H

#include "llvm-libc-types/__futex_word.h"
#include "llvm-libc-types/pid_t.h"
#include "__futex_word.h"
#include "pid_t.h"
typedef struct {
unsigned __is_pshared : 1;
unsigned __preference : 1;
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/pthread_spinlock_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#ifndef LLVM_LIBC_TYPES_PTHREAD_SPINLOCK_T_H
#define LLVM_LIBC_TYPES_PTHREAD_SPINLOCK_T_H
#include "llvm-libc-types/pid_t.h"
#include "pid_t.h"
typedef struct {
unsigned char __lockword;
pid_t __owner;
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/pthread_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_PTHREAD_T_H
#define LLVM_LIBC_TYPES_PTHREAD_T_H

#include "llvm-libc-types/__thread_type.h"
#include "__thread_type.h"

typedef __thread_type pthread_t;

Expand Down
8 changes: 4 additions & 4 deletions libc/include/llvm-libc-types/siginfo_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
#ifndef LLVM_LIBC_TYPES_SIGINFO_T_H
#define LLVM_LIBC_TYPES_SIGINFO_T_H

#include "llvm-libc-types/clock_t.h"
#include "llvm-libc-types/pid_t.h"
#include "llvm-libc-types/uid_t.h"
#include "llvm-libc-types/union_sigval.h"
#include "clock_t.h"
#include "pid_t.h"
#include "uid_t.h"
#include "union_sigval.h"

#define SI_MAX_SIZE 128

Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/sigset_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_SIGSET_T_H
#define LLVM_LIBC_TYPES_SIGSET_T_H

#include "llvm-libc-macros/signal-macros.h"
#include "../llvm-libc-macros/signal-macros.h" // __NSIGSET_WORDS

// This definition can be adjusted/specialized for different targets and
// platforms as necessary. This definition works for Linux on most targets.
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/stack_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_STACK_T_H
#define LLVM_LIBC_TYPES_STACK_T_H

#include "llvm-libc-types/size_t.h"
#include "size_t.h"

typedef struct {
// The order of the fields declared here should match the kernel definition
Expand Down
4 changes: 2 additions & 2 deletions libc/include/llvm-libc-types/struct_dirent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_DIRENT_H
#define LLVM_LIBC_TYPES_STRUCT_DIRENT_H

#include "llvm-libc-types/ino_t.h"
#include "llvm-libc-types/off_t.h"
#include "ino_t.h"
#include "off_t.h"

struct dirent {
ino_t d_ino;
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/struct_epoll_event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_EPOLL_EVENT_H
#define LLVM_LIBC_TYPES_STRUCT_EPOLL_EVENT_H

#include "llvm-libc-types/struct_epoll_data.h"
#include "struct_epoll_data.h"

typedef struct
#ifdef __x86_64__
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/struct_f_owner_ex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_F_OWNER_EX_H
#define LLVM_LIBC_TYPES_STRUCT_F_OWNER_EX_H

#include "llvm-libc-types/pid_t.h"
#include "pid_t.h"

enum pid_type {
F_OWNER_TID = 0,
Expand Down
4 changes: 2 additions & 2 deletions libc/include/llvm-libc-types/struct_flock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_FLOCK_H
#define LLVM_LIBC_TYPES_STRUCT_FLOCK_H

#include "llvm-libc-types/off_t.h"
#include "llvm-libc-types/pid_t.h"
#include "off_t.h"
#include "pid_t.h"

#include <stdint.h>

Expand Down
4 changes: 2 additions & 2 deletions libc/include/llvm-libc-types/struct_flock64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_FLOCK64_H
#define LLVM_LIBC_TYPES_STRUCT_FLOCK64_H

#include "llvm-libc-types/off64_t.h"
#include "llvm-libc-types/pid_t.h"
#include "off64_t.h"
#include "pid_t.h"

#include <stdint.h>

Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/struct_rlimit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_RLIMIT_H
#define LLVM_LIBC_TYPES_STRUCT_RLIMIT_H

#include "llvm-libc-types/rlim_t.h"
#include "rlim_t.h"

struct rlimit {
rlim_t rlim_cur;
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/struct_rusage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_RUSAGE_H
#define LLVM_LIBC_TYPES_STRUCT_RUSAGE_H

#include "llvm-libc-types/struct_timeval.h"
#include "struct_timeval.h"

struct rusage {
struct timeval ru_utime;
Expand Down
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-types/struct_sched_param.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_SCHED_PARAM_H
#define LLVM_LIBC_TYPES_STRUCT_SCHED_PARAM_H

#include "llvm-libc-types/pid_t.h"
#include "llvm-libc-types/struct_timespec.h"
#include "llvm-libc-types/time_t.h"
#include "pid_t.h"
#include "struct_timespec.h"
#include "time_t.h"

struct sched_param {
// Process or thread execution scheduling priority.
Expand Down
4 changes: 2 additions & 2 deletions libc/include/llvm-libc-types/struct_sigaction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_SIGACTION_H
#define LLVM_LIBC_TYPES_STRUCT_SIGACTION_H

#include "llvm-libc-types/siginfo_t.h"
#include "llvm-libc-types/sigset_t.h"
#include "siginfo_t.h"
#include "sigset_t.h"

struct sigaction {
union {
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/struct_sockaddr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_SOCKADDR_H
#define LLVM_LIBC_TYPES_STRUCT_SOCKADDR_H

#include "llvm-libc-types/sa_family_t.h"
#include "sa_family_t.h"

struct sockaddr {
sa_family_t sa_family;
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/struct_sockaddr_un.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_SOCKADDR_UN_H
#define LLVM_LIBC_TYPES_STRUCT_SOCKADDR_UN_H

#include "llvm-libc-types/sa_family_t.h"
#include "sa_family_t.h"

// This is the sockaddr specialization for AF_UNIX or AF_LOCAL sockets, as
// defined by posix.
Expand Down
20 changes: 10 additions & 10 deletions libc/include/llvm-libc-types/struct_stat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_STAT_H
#define LLVM_LIBC_TYPES_STRUCT_STAT_H

#include "llvm-libc-types/blkcnt_t.h"
#include "llvm-libc-types/blksize_t.h"
#include "llvm-libc-types/dev_t.h"
#include "llvm-libc-types/gid_t.h"
#include "llvm-libc-types/ino_t.h"
#include "llvm-libc-types/mode_t.h"
#include "llvm-libc-types/nlink_t.h"
#include "llvm-libc-types/off_t.h"
#include "llvm-libc-types/struct_timespec.h"
#include "llvm-libc-types/uid_t.h"
#include "blkcnt_t.h"
#include "blksize_t.h"
#include "dev_t.h"
#include "gid_t.h"
#include "ino_t.h"
#include "mode_t.h"
#include "nlink_t.h"
#include "off_t.h"
#include "struct_timespec.h"
#include "uid_t.h"

struct stat {
dev_t st_dev;
Expand Down
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-types/struct_termios.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#ifndef __LLVM_LIBC_TYPES_STRUCT_TERMIOS_H__
#define __LLVM_LIBC_TYPES_STRUCT_TERMIOS_H__

#include "llvm-libc-types/cc_t.h"
#include "llvm-libc-types/speed_t.h"
#include "llvm-libc-types/tcflag_t.h"
#include "cc_t.h"
#include "speed_t.h"
#include "tcflag_t.h"

struct termios {
tcflag_t c_iflag; // Input mode flags
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/struct_timespec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_TIMESPEC_H
#define LLVM_LIBC_TYPES_STRUCT_TIMESPEC_H

#include "llvm-libc-types/time_t.h"
#include "time_t.h"

struct timespec {
time_t tv_sec; /* Seconds. */
Expand Down
4 changes: 2 additions & 2 deletions libc/include/llvm-libc-types/struct_timeval.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_TYPES_STRUCT_TIMEVAL_H
#define LLVM_LIBC_TYPES_STRUCT_TIMEVAL_H

#include "llvm-libc-types/suseconds_t.h"
#include "llvm-libc-types/time_t.h"
#include "suseconds_t.h"
#include "time_t.h"

struct timeval {
time_t tv_sec; // Seconds
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/thrd_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TYPES_THRD_T_H
#define LLVM_LIBC_TYPES_THRD_T_H

#include "llvm-libc-types/__thread_type.h"
#include "__thread_type.h"

typedef __thread_type thrd_t;

Expand Down
2 changes: 1 addition & 1 deletion libc/include/sys/auxv.h.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "__llvm-libc-common.h"

#include "llvm-libc-macros/sys-auxv-macros.h"
#include "../llvm-libc-macros/sys-auxv-macros.h"

%%public_api()

Expand Down
2 changes: 1 addition & 1 deletion libc/include/sys/epoll.h.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "__llvm-libc-common.h"

#include "llvm-libc-macros/sys-epoll-macros.h"
#include "../llvm-libc-macros/sys-epoll-macros.h"

%%public_api()

Expand Down
2 changes: 1 addition & 1 deletion libc/include/sys/ioctl.h.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "__llvm-libc-common.h"

#include "llvm-libc-macros/sys-ioctl-macros.h"
#include "../llvm-libc-macros/sys-ioctl-macros.h"

%%public_api()

Expand Down
2 changes: 1 addition & 1 deletion libc/include/sys/mman.h.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "__llvm-libc-common.h"

#include "llvm-libc-macros/sys-mman-macros.h"
#include "../llvm-libc-macros/sys-mman-macros.h"

%%public_api()

Expand Down
2 changes: 1 addition & 1 deletion libc/include/sys/queue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
#ifndef SYS_QUEUE_H
#define SYS_QUEUE_H

#include "llvm-libc-macros/sys-queue-macros.h"
#include "../llvm-libc-macros/sys-queue-macros.h"

#endif // SYS_QUEUE_H
Loading
Loading