Skip to content

Commit 88a0a31

Browse files
[libc] Use relative inclusion for public headers. (#114324)
We are finalizing the header inclusion policy, and for our public headers in the `libc/include` folder, they must use relative path in `"..."` when including each other. This PR does the cleanup making sure that all the public header inclusions in `libc/include` folder use relative paths. --------- Co-authored-by: Nick Desaulniers <[email protected]>
1 parent 7792dbe commit 88a0a31

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+73
-73
lines changed

libc/include/gpu/rpc.h.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "__llvm-libc-common.h"
1313

14-
#include "llvm-libc-types/rpc_opcodes_t.h"
14+
#include "../llvm-libc-types/rpc_opcodes_t.h"
1515

1616
%%public_api()
1717

libc/include/llvm-libc-macros/containerof-macro.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_MACROS_CONTAINEROF_MACRO_H
1010
#define LLVM_LIBC_MACROS_CONTAINEROF_MACRO_H
1111

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

1414
#define __containerof(ptr, type, member) \
1515
({ \

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#ifndef LLVM_LIBC_MACROS_SYS_QUEUE_MACROS_H
1010
#define LLVM_LIBC_MACROS_SYS_QUEUE_MACROS_H
1111

12-
#include "llvm-libc-macros/containerof-macro.h"
13-
#include "llvm-libc-macros/null-macro.h"
12+
#include "containerof-macro.h"
13+
#include "null-macro.h"
1414

1515
#ifdef __cplusplus
1616
#define QUEUE_TYPEOF(type) type

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES___MUTEX_TYPE_H
1010
#define LLVM_LIBC_TYPES___MUTEX_TYPE_H
1111

12-
#include "llvm-libc-types/__futex_word.h"
12+
#include "__futex_word.h"
1313

1414
typedef struct {
1515
unsigned char __timed;

libc/include/llvm-libc-types/cnd_t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_CND_T_H
1010
#define LLVM_LIBC_TYPES_CND_T_H
1111

12-
#include "llvm-libc-types/__futex_word.h"
12+
#include "__futex_word.h"
1313

1414
typedef struct {
1515
void *__qfront;

libc/include/llvm-libc-types/cookie_io_functions_t.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
#ifndef LLVM_LIBC_TYPES_COOKIE_IO_FUNCTIONS_T_H
1010
#define LLVM_LIBC_TYPES_COOKIE_IO_FUNCTIONS_T_H
1111

12-
#include "llvm-libc-types/off64_t.h"
13-
#include "llvm-libc-types/size_t.h"
14-
#include "llvm-libc-types/ssize_t.h"
12+
#include "off64_t.h"
13+
#include "size_t.h"
14+
#include "ssize_t.h"
1515

1616
typedef ssize_t cookie_read_function_t(void *, char *, size_t);
1717
typedef ssize_t cookie_write_function_t(void *, const char *, size_t);

libc/include/llvm-libc-types/fd_set.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_FD_SET_H
1010
#define LLVM_LIBC_TYPES_FD_SET_H
1111

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

1414
typedef struct {
1515
__FD_SET_WORD_TYPE __set[__FD_SET_ARRAYSIZE];

libc/include/llvm-libc-types/mtx_t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_MTX_T_H
1010
#define LLVM_LIBC_TYPES_MTX_T_H
1111

12-
#include "llvm-libc-types/__mutex_type.h"
12+
#include "__mutex_type.h"
1313

1414
typedef __mutex_type mtx_t;
1515

libc/include/llvm-libc-types/once_flag.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_ONCE_FLAG_H
1010
#define LLVM_LIBC_TYPES_ONCE_FLAG_H
1111

12-
#include "llvm-libc-types/__futex_word.h"
12+
#include "__futex_word.h"
1313

1414
#ifdef __linux__
1515
typedef __futex_word once_flag;

libc/include/llvm-libc-types/pthread_attr_t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_PTHREAD_ATTR_T_H
1010
#define LLVM_LIBC_TYPES_PTHREAD_ATTR_T_H
1111

12-
#include "llvm-libc-types/size_t.h"
12+
#include "size_t.h"
1313

1414
typedef struct {
1515
int __detachstate;

libc/include/llvm-libc-types/pthread_mutex_t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_PTHREAD_MUTEX_T_H
1010
#define LLVM_LIBC_TYPES_PTHREAD_MUTEX_T_H
1111

12-
#include "llvm-libc-types/__mutex_type.h"
12+
#include "__mutex_type.h"
1313

1414
typedef __mutex_type pthread_mutex_t;
1515

libc/include/llvm-libc-types/pthread_once_t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_PTHREAD_ONCE_T_H
1010
#define LLVM_LIBC_TYPES_PTHREAD_ONCE_T_H
1111

12-
#include "llvm-libc-types/__futex_word.h"
12+
#include "__futex_word.h"
1313

1414
#ifdef __linux__
1515
typedef __futex_word pthread_once_t;

libc/include/llvm-libc-types/pthread_rwlock_t.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#ifndef LLVM_LIBC_TYPES_PTHREAD_RWLOCK_T_H
1010
#define LLVM_LIBC_TYPES_PTHREAD_RWLOCK_T_H
1111

12-
#include "llvm-libc-types/__futex_word.h"
13-
#include "llvm-libc-types/pid_t.h"
12+
#include "__futex_word.h"
13+
#include "pid_t.h"
1414
typedef struct {
1515
unsigned __is_pshared : 1;
1616
unsigned __preference : 1;

libc/include/llvm-libc-types/pthread_spinlock_t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#ifndef LLVM_LIBC_TYPES_PTHREAD_SPINLOCK_T_H
1010
#define LLVM_LIBC_TYPES_PTHREAD_SPINLOCK_T_H
11-
#include "llvm-libc-types/pid_t.h"
11+
#include "pid_t.h"
1212
typedef struct {
1313
unsigned char __lockword;
1414
pid_t __owner;

libc/include/llvm-libc-types/pthread_t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_PTHREAD_T_H
1010
#define LLVM_LIBC_TYPES_PTHREAD_T_H
1111

12-
#include "llvm-libc-types/__thread_type.h"
12+
#include "__thread_type.h"
1313

1414
typedef __thread_type pthread_t;
1515

libc/include/llvm-libc-types/siginfo_t.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#ifndef LLVM_LIBC_TYPES_SIGINFO_T_H
1010
#define LLVM_LIBC_TYPES_SIGINFO_T_H
1111

12-
#include "llvm-libc-types/clock_t.h"
13-
#include "llvm-libc-types/pid_t.h"
14-
#include "llvm-libc-types/uid_t.h"
15-
#include "llvm-libc-types/union_sigval.h"
12+
#include "clock_t.h"
13+
#include "pid_t.h"
14+
#include "uid_t.h"
15+
#include "union_sigval.h"
1616

1717
#define SI_MAX_SIZE 128
1818

libc/include/llvm-libc-types/sigset_t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_SIGSET_T_H
1010
#define LLVM_LIBC_TYPES_SIGSET_T_H
1111

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

1414
// This definition can be adjusted/specialized for different targets and
1515
// platforms as necessary. This definition works for Linux on most targets.

libc/include/llvm-libc-types/stack_t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_STACK_T_H
1010
#define LLVM_LIBC_TYPES_STACK_T_H
1111

12-
#include "llvm-libc-types/size_t.h"
12+
#include "size_t.h"
1313

1414
typedef struct {
1515
// The order of the fields declared here should match the kernel definition

libc/include/llvm-libc-types/struct_dirent.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_DIRENT_H
1010
#define LLVM_LIBC_TYPES_STRUCT_DIRENT_H
1111

12-
#include "llvm-libc-types/ino_t.h"
13-
#include "llvm-libc-types/off_t.h"
12+
#include "ino_t.h"
13+
#include "off_t.h"
1414

1515
struct dirent {
1616
ino_t d_ino;

libc/include/llvm-libc-types/struct_epoll_event.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_EPOLL_EVENT_H
1010
#define LLVM_LIBC_TYPES_STRUCT_EPOLL_EVENT_H
1111

12-
#include "llvm-libc-types/struct_epoll_data.h"
12+
#include "struct_epoll_data.h"
1313

1414
typedef struct
1515
#ifdef __x86_64__

libc/include/llvm-libc-types/struct_f_owner_ex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_F_OWNER_EX_H
1010
#define LLVM_LIBC_TYPES_STRUCT_F_OWNER_EX_H
1111

12-
#include "llvm-libc-types/pid_t.h"
12+
#include "pid_t.h"
1313

1414
enum pid_type {
1515
F_OWNER_TID = 0,

libc/include/llvm-libc-types/struct_flock.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_FLOCK_H
1010
#define LLVM_LIBC_TYPES_STRUCT_FLOCK_H
1111

12-
#include "llvm-libc-types/off_t.h"
13-
#include "llvm-libc-types/pid_t.h"
12+
#include "off_t.h"
13+
#include "pid_t.h"
1414

1515
#include <stdint.h>
1616

libc/include/llvm-libc-types/struct_flock64.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_FLOCK64_H
1010
#define LLVM_LIBC_TYPES_STRUCT_FLOCK64_H
1111

12-
#include "llvm-libc-types/off64_t.h"
13-
#include "llvm-libc-types/pid_t.h"
12+
#include "off64_t.h"
13+
#include "pid_t.h"
1414

1515
#include <stdint.h>
1616

libc/include/llvm-libc-types/struct_rlimit.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_RLIMIT_H
1010
#define LLVM_LIBC_TYPES_STRUCT_RLIMIT_H
1111

12-
#include "llvm-libc-types/rlim_t.h"
12+
#include "rlim_t.h"
1313

1414
struct rlimit {
1515
rlim_t rlim_cur;

libc/include/llvm-libc-types/struct_rusage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_RUSAGE_H
1010
#define LLVM_LIBC_TYPES_STRUCT_RUSAGE_H
1111

12-
#include "llvm-libc-types/struct_timeval.h"
12+
#include "struct_timeval.h"
1313

1414
struct rusage {
1515
struct timeval ru_utime;

libc/include/llvm-libc-types/struct_sched_param.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_SCHED_PARAM_H
1010
#define LLVM_LIBC_TYPES_STRUCT_SCHED_PARAM_H
1111

12-
#include "llvm-libc-types/pid_t.h"
13-
#include "llvm-libc-types/struct_timespec.h"
14-
#include "llvm-libc-types/time_t.h"
12+
#include "pid_t.h"
13+
#include "struct_timespec.h"
14+
#include "time_t.h"
1515

1616
struct sched_param {
1717
// Process or thread execution scheduling priority.

libc/include/llvm-libc-types/struct_sigaction.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_SIGACTION_H
1010
#define LLVM_LIBC_TYPES_STRUCT_SIGACTION_H
1111

12-
#include "llvm-libc-types/siginfo_t.h"
13-
#include "llvm-libc-types/sigset_t.h"
12+
#include "siginfo_t.h"
13+
#include "sigset_t.h"
1414

1515
struct sigaction {
1616
union {

libc/include/llvm-libc-types/struct_sockaddr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_SOCKADDR_H
1010
#define LLVM_LIBC_TYPES_STRUCT_SOCKADDR_H
1111

12-
#include "llvm-libc-types/sa_family_t.h"
12+
#include "sa_family_t.h"
1313

1414
struct sockaddr {
1515
sa_family_t sa_family;

libc/include/llvm-libc-types/struct_sockaddr_un.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_SOCKADDR_UN_H
1010
#define LLVM_LIBC_TYPES_STRUCT_SOCKADDR_UN_H
1111

12-
#include "llvm-libc-types/sa_family_t.h"
12+
#include "sa_family_t.h"
1313

1414
// This is the sockaddr specialization for AF_UNIX or AF_LOCAL sockets, as
1515
// defined by posix.

libc/include/llvm-libc-types/struct_stat.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_STAT_H
1010
#define LLVM_LIBC_TYPES_STRUCT_STAT_H
1111

12-
#include "llvm-libc-types/blkcnt_t.h"
13-
#include "llvm-libc-types/blksize_t.h"
14-
#include "llvm-libc-types/dev_t.h"
15-
#include "llvm-libc-types/gid_t.h"
16-
#include "llvm-libc-types/ino_t.h"
17-
#include "llvm-libc-types/mode_t.h"
18-
#include "llvm-libc-types/nlink_t.h"
19-
#include "llvm-libc-types/off_t.h"
20-
#include "llvm-libc-types/struct_timespec.h"
21-
#include "llvm-libc-types/uid_t.h"
12+
#include "blkcnt_t.h"
13+
#include "blksize_t.h"
14+
#include "dev_t.h"
15+
#include "gid_t.h"
16+
#include "ino_t.h"
17+
#include "mode_t.h"
18+
#include "nlink_t.h"
19+
#include "off_t.h"
20+
#include "struct_timespec.h"
21+
#include "uid_t.h"
2222

2323
struct stat {
2424
dev_t st_dev;

libc/include/llvm-libc-types/struct_termios.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
#ifndef __LLVM_LIBC_TYPES_STRUCT_TERMIOS_H__
1010
#define __LLVM_LIBC_TYPES_STRUCT_TERMIOS_H__
1111

12-
#include "llvm-libc-types/cc_t.h"
13-
#include "llvm-libc-types/speed_t.h"
14-
#include "llvm-libc-types/tcflag_t.h"
12+
#include "cc_t.h"
13+
#include "speed_t.h"
14+
#include "tcflag_t.h"
1515

1616
struct termios {
1717
tcflag_t c_iflag; // Input mode flags

libc/include/llvm-libc-types/struct_timespec.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_TIMESPEC_H
1010
#define LLVM_LIBC_TYPES_STRUCT_TIMESPEC_H
1111

12-
#include "llvm-libc-types/time_t.h"
12+
#include "time_t.h"
1313

1414
struct timespec {
1515
time_t tv_sec; /* Seconds. */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#ifndef LLVM_LIBC_TYPES_STRUCT_TIMEVAL_H
1010
#define LLVM_LIBC_TYPES_STRUCT_TIMEVAL_H
1111

12-
#include "llvm-libc-types/suseconds_t.h"
13-
#include "llvm-libc-types/time_t.h"
12+
#include "suseconds_t.h"
13+
#include "time_t.h"
1414

1515
struct timeval {
1616
time_t tv_sec; // Seconds

libc/include/llvm-libc-types/thrd_t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_TYPES_THRD_T_H
1010
#define LLVM_LIBC_TYPES_THRD_T_H
1111

12-
#include "llvm-libc-types/__thread_type.h"
12+
#include "__thread_type.h"
1313

1414
typedef __thread_type thrd_t;
1515

libc/include/sys/auxv.h.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "__llvm-libc-common.h"
1313

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

1616
%%public_api()
1717

libc/include/sys/epoll.h.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "__llvm-libc-common.h"
1313

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

1616
%%public_api()
1717

libc/include/sys/ioctl.h.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "__llvm-libc-common.h"
1313

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

1616
%%public_api()
1717

libc/include/sys/mman.h.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "__llvm-libc-common.h"
1313

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

1616
%%public_api()
1717

libc/include/sys/queue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
#ifndef SYS_QUEUE_H
1010
#define SYS_QUEUE_H
1111

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

1414
#endif // SYS_QUEUE_H

0 commit comments

Comments
 (0)