Skip to content

[libc] fix up the use of angle includes in include/ #86027

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.

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 1 commit into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/arpa/inet.h.def
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_ARPA_INET_H
#define LLVM_LIBC_ARPA_INET_H

#include <__llvm-libc-common.h>
#include "__llvm-libc-common.h"

#include <inttypes.h>

Expand Down
2 changes: 1 addition & 1 deletion libc/include/assert.h.def
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <__llvm-libc-common.h>
#include "__llvm-libc-common.h"

// This file may be usefully included multiple times to change assert()'s
// definition based on NDEBUG.
Expand Down
2 changes: 1 addition & 1 deletion libc/include/ctype.h.def
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_CTYPE_H
#define LLVM_LIBC_CTYPE_H

#include <__llvm-libc-common.h>
#include "__llvm-libc-common.h"

%%public_api()

Expand Down
2 changes: 1 addition & 1 deletion libc/include/dirent.h.def
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_DIRENT_H
#define LLVM_LIBC_DIRENT_H

#include <__llvm-libc-common.h>
#include "__llvm-libc-common.h"

%%public_api()

Expand Down
4 changes: 2 additions & 2 deletions libc/include/errno.h.def
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_ERRNO_H
#define LLVM_LIBC_ERRNO_H

#include <__llvm-libc-common.h>
#include "__llvm-libc-common.h"

#ifdef __linux__

Expand Down Expand Up @@ -40,7 +40,7 @@
#endif // ENOTRECOVERABLE

#else // __linux__
#include <llvm-libc-macros/generic-error-number-macros.h>
#include "llvm-libc-macros/generic-error-number-macros.h"
#endif

#if !defined(__AMDGPU__) && !defined(__NVPTX__)
Expand Down
4 changes: 2 additions & 2 deletions libc/include/fcntl.h.def
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_FCNTL_H
#define LLVM_LIBC_FCNTL_H

#include <__llvm-libc-common.h>
#include <llvm-libc-macros/fcntl-macros.h>
#include "__llvm-libc-common.h"
#include "llvm-libc-macros/fcntl-macros.h"

%%public_api()

Expand Down
4 changes: 2 additions & 2 deletions libc/include/features.h.def
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_FEATURES_H
#define LLVM_LIBC_FEATURES_H

#include <__llvm-libc-common.h>
#include <llvm-libc-macros/features-macros.h>
#include "__llvm-libc-common.h"
#include "llvm-libc-macros/features-macros.h"

%%public_api()

Expand Down
4 changes: 2 additions & 2 deletions libc/include/fenv.h.def
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_FENV_H
#define LLVM_LIBC_FENV_H

#include <__llvm-libc-common.h>
#include <llvm-libc-macros/fenv-macros.h>
#include "__llvm-libc-common.h"
#include "llvm-libc-macros/fenv-macros.h"

%%public_api()

Expand Down
2 changes: 1 addition & 1 deletion libc/include/float.h.def
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
#ifndef LLVM_LIBC_FLOAT_H
#define LLVM_LIBC_FLOAT_H

#include <llvm-libc-macros/float-macros.h>
#include "llvm-libc-macros/float-macros.h"

#endif // LLVM_LIBC_FLOAT_H
4 changes: 2 additions & 2 deletions libc/include/gpu/rpc.h.def
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#ifndef LLVM_LIBC_GPU_RPC_H
#define LLVM_LIBC_GPU_RPC_H

#include <__llvm-libc-common.h>
#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
4 changes: 2 additions & 2 deletions libc/include/inttypes.h.def
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_INTTYPES_H
#define LLVM_LIBC_INTTYPES_H

#include <__llvm-libc-common.h>
#include <llvm-libc-macros/inttypes-macros.h>
#include "__llvm-libc-common.h"
#include "llvm-libc-macros/inttypes-macros.h"
#include <stdint.h>

%%public_api()
Expand Down
2 changes: 1 addition & 1 deletion libc/include/limits.h.def
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
#ifndef LLVM_LIBC_LIMITS_H
#define LLVM_LIBC_LIMITS_H

#include <llvm-libc-macros/limits-macros.h>
#include "llvm-libc-macros/limits-macros.h"

#endif // LLVM_LIBC_LIMITS_H
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-macros/containerof-macro.h
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 "llvm-libc-macros/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
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 "llvm-libc-macros/containerof-macro.h"
#include "llvm-libc-macros/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
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 "llvm-libc-types/__futex_word.h"

typedef struct {
unsigned char __timed;
Expand Down
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-types/cookie_io_functions_t.h
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 "llvm-libc-types/off64_t.h"
#include "llvm-libc-types/size_t.h"
#include "llvm-libc-types/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
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_SETSIZE

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
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 "llvm-libc-types/__mutex_type.h"

typedef __mutex_type mtx_t;

Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/once_flag.h
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 "llvm-libc-types/__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
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 "llvm-libc-types/size_t.h"

typedef struct {
int __detachstate;
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/pthread_mutex_t.h
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 "llvm-libc-types/__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
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 "llvm-libc-types/__futex_word.h"

#ifdef __linux__
typedef __futex_word pthread_once_t;
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/pthread_t.h
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 "llvm-libc-types/__thread_type.h"

typedef __thread_type pthread_t;

Expand Down
8 changes: 4 additions & 4 deletions libc/include/llvm-libc-types/siginfo_t.h
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 "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"

#define SI_MAX_SIZE 128

Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/sigset_t.h
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"

// 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
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 "llvm-libc-types/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
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 "llvm-libc-types/ino_t.h"
#include "llvm-libc-types/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
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 "llvm-libc-types/struct_epoll_data.h"

typedef struct epoll_event {
__UINT32_TYPE__ events;
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/struct_rlimit.h
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 "llvm-libc-types/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
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 "llvm-libc-types/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
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 "llvm-libc-types/pid_t.h"
#include "llvm-libc-types/struct_timespec.h"
#include "llvm-libc-types/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
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 "llvm-libc-types/siginfo_t.h"
#include "llvm-libc-types/sigset_t.h"

struct sigaction {
union {
Expand Down
2 changes: 1 addition & 1 deletion libc/include/llvm-libc-types/struct_sockaddr.h
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 "llvm-libc-types/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
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 "llvm-libc-types/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
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 "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"

struct stat {
dev_t st_dev;
Expand Down
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-types/struct_termios.h
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 "llvm-libc-types/cc_t.h"
#include "llvm-libc-types/speed_t.h"
#include "llvm-libc-types/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
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 "llvm-libc-types/time_t.h"

struct timespec {
time_t tv_sec; /* Seconds. */
Expand Down
Loading