Skip to content

[libc] fix clang-tidy llvm-header-guard warnings #82679

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
Feb 28, 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
6 changes: 3 additions & 3 deletions libc/include/__llvm-libc-common.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef LLVM_LIBC___COMMON_H
#define LLVM_LIBC___COMMON_H
#ifndef LLVM_LIBC_COMMON_H
#define LLVM_LIBC_COMMON_H

#ifdef __cplusplus

Expand Down Expand Up @@ -51,4 +51,4 @@

#endif // __cplusplus

#endif // LLVM_LIBC___COMMON_H
#endif // LLVM_LIBC_COMMON_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/containerof-macro.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_CONTAINEROF_MACRO_H
#define __LLVM_LIBC_MACROS_CONTAINEROF_MACRO_H
#ifndef LLVM_LIBC_MACROS_CONTAINEROF_MACRO_H
#define LLVM_LIBC_MACROS_CONTAINEROF_MACRO_H

#include <llvm-libc-macros/offsetof-macro.h>

Expand All @@ -17,4 +17,4 @@
(type *)(void *)((const char *)__ptr - offsetof(type, member)); \
})

#endif // __LLVM_LIBC_MACROS_CONTAINEROF_MACRO_H
#endif // LLVM_LIBC_MACROS_CONTAINEROF_MACRO_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/fcntl-macros.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef __LLVM_LIBC_MACROS_FCNTL_MACROS_H
#define __LLVM_LIBC_MACROS_FCNTL_MACROS_H
#ifndef LLVM_LIBC_MACROS_FCNTL_MACROS_H
#define LLVM_LIBC_MACROS_FCNTL_MACROS_H

#ifdef __linux__
#include "linux/fcntl-macros.h"
#endif

#endif // __LLVM_LIBC_MACROS_FCNTL_MACROS_H
#endif // LLVM_LIBC_MACROS_FCNTL_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/features-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_FEATURES_MACROS_H
#define __LLVM_LIBC_MACROS_FEATURES_MACROS_H
#ifndef LLVM_LIBC_MACROS_FEATURES_MACROS_H
#define LLVM_LIBC_MACROS_FEATURES_MACROS_H

#define __LLVM_LIBC__ 1

#endif // __LLVM_LIBC_MACROS_FEATURES_MACROS_H
#endif // LLVM_LIBC_MACROS_FEATURES_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/fenv-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_FENV_MACROS_H
#define __LLVM_LIBC_MACROS_FENV_MACROS_H
#ifndef LLVM_LIBC_MACROS_FENV_MACROS_H
#define LLVM_LIBC_MACROS_FENV_MACROS_H

#define FE_DIVBYZERO 1
#define FE_INEXACT 2
Expand All @@ -24,4 +24,4 @@

#define FE_DFL_ENV ((fenv_t *)-1)

#endif // __LLVM_LIBC_MACROS_FENV_MACROS_H
#endif // LLVM_LIBC_MACROS_FENV_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/file-seek-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_FILE_SEEK_MACROS_H
#define __LLVM_LIBC_MACROS_FILE_SEEK_MACROS_H
#ifndef LLVM_LIBC_MACROS_FILE_SEEK_MACROS_H
#define LLVM_LIBC_MACROS_FILE_SEEK_MACROS_H

#define SEEK_SET 0
#define SEEK_CUR 1
#define SEEK_END 2

#endif // __LLVM_LIBC_MACROS_FILE_SEEK_MACROS_H
#endif // LLVM_LIBC_MACROS_FILE_SEEK_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/float-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_FLOAT_MACROS_H
#define __LLVM_LIBC_MACROS_FLOAT_MACROS_H
#ifndef LLVM_LIBC_MACROS_FLOAT_MACROS_H
#define LLVM_LIBC_MACROS_FLOAT_MACROS_H

// Suppress `#include_next is a language extension` warnings.
#ifdef __clang__
Expand Down Expand Up @@ -169,4 +169,4 @@

// TODO: Add FLT16 and FLT128 constants.

#endif // __LLVM_LIBC_MACROS_FLOAT_MACROS_H
#endif // LLVM_LIBC_MACROS_FLOAT_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/generic-error-number-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_GENERIC_ERROR_NUMBER_MACROS_H
#define __LLVM_LIBC_MACROS_GENERIC_ERROR_NUMBER_MACROS_H
#ifndef LLVM_LIBC_MACROS_GENERIC_ERROR_NUMBER_MACROS_H
#define LLVM_LIBC_MACROS_GENERIC_ERROR_NUMBER_MACROS_H

#define EPERM 1
#define ENOENT 2
Expand Down Expand Up @@ -45,4 +45,4 @@
#define ERANGE 34
#define EILSEQ 35

#endif // __LLVM_LIBC_MACROS_GENERIC_ERROR_NUMBER_MACROS_H
#endif // LLVM_LIBC_MACROS_GENERIC_ERROR_NUMBER_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/gpu/time-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_GPU_TIME_MACROS_H
#define __LLVM_LIBC_MACROS_GPU_TIME_MACROS_H
#ifndef LLVM_LIBC_MACROS_GPU_TIME_MACROS_H
#define LLVM_LIBC_MACROS_GPU_TIME_MACROS_H

#define CLOCKS_PER_SEC 1000000

#endif // __LLVM_LIBC_MACROS_GPU_TIME_MACROS_H
#endif // LLVM_LIBC_MACROS_GPU_TIME_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/inttypes-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#ifndef __LLVM_LIBC_MACROS_INTTYPES_MACROS_H
#define __LLVM_LIBC_MACROS_INTTYPES_MACROS_H
#ifndef LLVM_LIBC_MACROS_INTTYPES_MACROS_H
#define LLVM_LIBC_MACROS_INTTYPES_MACROS_H

// fprintf/scanf format macros.
// POSIX.1-2008, Technical Corrigendum 1, XBD/TC1-2008/0050 [211] is applied.
Expand Down Expand Up @@ -286,4 +286,4 @@
#define SCNxMAX __UINTMAX_FMTx__
#define SCNxPTR __UINTPTR_FMTx__

#endif // __LLVM_LIBC_MACROS_INTTYPES_MACROS_H
#endif // LLVM_LIBC_MACROS_INTTYPES_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/limits-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_LIMITS_MACROS_H
#define __LLVM_LIBC_MACROS_LIMITS_MACROS_H
#ifndef LLVM_LIBC_MACROS_LIMITS_MACROS_H
#define LLVM_LIBC_MACROS_LIMITS_MACROS_H

// Define all C23 macro constants of limits.h

Expand Down Expand Up @@ -225,4 +225,4 @@
#define ULLONG_MIN 0ULL
#endif // ULLONG_MIN

#endif // __LLVM_LIBC_MACROS_LIMITS_MACROS_H
#endif // LLVM_LIBC_MACROS_LIMITS_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/linux/fcntl-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_LINUX_FCNTL_MACROS_H
#define __LLVM_LIBC_MACROS_LINUX_FCNTL_MACROS_H
#ifndef LLVM_LIBC_MACROS_LINUX_FCNTL_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_FCNTL_MACROS_H

// File creation flags
#define O_CLOEXEC 02000000
Expand Down Expand Up @@ -68,4 +68,4 @@
#define F_GETFL 3
#define F_SETFL 4

#endif // __LLVM_LIBC_MACROS_LINUX_FCNTL_MACROS_H
#endif // LLVM_LIBC_MACROS_LINUX_FCNTL_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/linux/sched-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_LINUX_SCHED_MACROS_H
#define __LLVM_LIBC_MACROS_LINUX_SCHED_MACROS_H
#ifndef LLVM_LIBC_MACROS_LINUX_SCHED_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_SCHED_MACROS_H

// Definitions of SCHED_* macros must match was linux as at:
// https://elixir.bootlin.com/linux/latest/source/include/uapi/linux/sched.h
Expand All @@ -26,4 +26,4 @@
#define CPU_COUNT_S(setsize, set) __sched_getcpucount(setsize, set)
#define CPU_COUNT(set) CPU_COUNT_S(sizeof(cpu_set_t), set)

#endif // __LLVM_LIBC_MACROS_LINUX_SCHED_MACROS_H
#endif // LLVM_LIBC_MACROS_LINUX_SCHED_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/linux/signal-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_LINUX_SIGNUM_MACROS_H
#define __LLVM_LIBC_MACROS_LINUX_SIGNUM_MACROS_H
#ifndef LLVM_LIBC_MACROS_LINUX_SIGNAL_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_SIGNAL_MACROS_H

#define SIGHUP 1
#define SIGINT 2
Expand Down Expand Up @@ -101,4 +101,4 @@
#define CLD_STOPPED 5 // child has stopped
#define CLD_CONTINUED 6 // stopped child has continued

#endif // __LLVM_LIBC_MACROS_LINUX_SIGNUM_MACROS_H
#endif // LLVM_LIBC_MACROS_LINUX_SIGNAL_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/linux/sys-ioctl-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_LINUX_SYS_IOCTL_MACROS_H
#define __LLVM_LIBC_MACROS_LINUX_SYS_IOCTL_MACROS_H
#ifndef LLVM_LIBC_MACROS_LINUX_SYS_IOCTL_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_SYS_IOCTL_MACROS_H

// TODO (michaelrj): Finish defining these macros.
// Just defining this macro for the moment since it's all that we need right
Expand All @@ -16,4 +16,4 @@
// think is worth digging into right now.
#define TIOCGETD 0x5424

#endif // __LLVM_LIBC_MACROS_LINUX_SYS_IOCTL_MACROS_H
#endif // LLVM_LIBC_MACROS_LINUX_SYS_IOCTL_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/linux/sys-random-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_LINUX_SYS_RANDOM_MACROS_H
#define __LLVM_LIBC_MACROS_LINUX_SYS_RANDOM_MACROS_H
#ifndef LLVM_LIBC_MACROS_LINUX_SYS_RANDOM_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_SYS_RANDOM_MACROS_H

// Getrandom flags
#define GRND_RANDOM 0x0001
#define GRND_NONBLOCK 0x0002
#define GRND_INSECURE 0x0004

#endif // __LLVM_LIBC_MACROS_LINUX_SYS_RANDOM_MACROS_H
#endif // LLVM_LIBC_MACROS_LINUX_SYS_RANDOM_MACROS_H
5 changes: 5 additions & 0 deletions libc/include/llvm-libc-macros/linux/sys-resource-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
//
//===----------------------------------------------------------------------===//

#ifndef LLVM_LIBC_MACROS_LINUX_SYS_RESOURCE_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_SYS_RESOURCE_MACROS_H

#define RLIMIT_CPU 0
#define RLIMIT_FSIZE 1
#define RLIMIT_DATA 2
Expand All @@ -24,3 +27,5 @@
#define RLIMIT_RTTIME 15

#define RLIM_INFINITY (~0UL)

#endif // LLVM_LIBC_MACROS_LINUX_SYS_RESOURCE_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/linux/sys-socket-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_LINUX_SYS_SOCKET_MACROS_H
#define __LLVM_LIBC_MACROS_LINUX_SYS_SOCKET_MACROS_H
#ifndef LLVM_LIBC_MACROS_LINUX_SYS_SOCKET_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_SYS_SOCKET_MACROS_H

// IEEE Std 1003.1-2017 - basedefs/sys_socket.h.html
// Macro values come from the Linux syscall interface.
Expand All @@ -25,4 +25,4 @@
#define SOCK_SEQPACKET 5
#define SOCK_PACKET 10

#endif // __LLVM_LIBC_MACROS_LINUX_SYS_SOCKET_MACROS_H
#endif // LLVM_LIBC_MACROS_LINUX_SYS_SOCKET_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/linux/sys-stat-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_LINUX_SYS_STAT_MACROS_H
#define __LLVM_LIBC_MACROS_LINUX_SYS_STAT_MACROS_H
#ifndef LLVM_LIBC_MACROS_LINUX_SYS_STAT_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_SYS_STAT_MACROS_H

// Definitions from linux/stat.h
#define S_IFMT 0170000
Expand Down Expand Up @@ -45,4 +45,4 @@
#define S_IWOTH 00002
#define S_IXOTH 00001

#endif // __LLVM_LIBC_MACROS_LINUX_SYS_STAT_MACROS_H
#endif // LLVM_LIBC_MACROS_LINUX_SYS_STAT_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/linux/sys-time-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_LINUX_SYS_TIME_MACROS_H
#define __LLVM_LIBC_MACROS_LINUX_SYS_TIME_MACROS_H
#ifndef LLVM_LIBC_MACROS_LINUX_SYS_TIME_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_SYS_TIME_MACROS_H

// Add two timevals and put the result in timeval_ptr_result. If the resulting
// usec value is greater than 999,999 then the microseconds are turned into full
Expand Down Expand Up @@ -50,4 +50,4 @@
? ((timeval_ptr_a)->tv_usec CMP(timeval_ptr_b)->tv_usec) \
: ((timeval_ptr_a)->tv_sec CMP(timeval_ptr_b)->tv_sec))

#endif // __LLVM_LIBC_MACROS_LINUX_SYS_TIME_MACROS_H
#endif // LLVM_LIBC_MACROS_LINUX_SYS_TIME_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/linux/sys-wait-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_LINUX_SYS_WAIT_MACROS_H
#define __LLVM_LIBC_MACROS_LINUX_SYS_WAIT_MACROS_H
#ifndef LLVM_LIBC_MACROS_LINUX_SYS_WAIT_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_SYS_WAIT_MACROS_H

// Wait flags
#define WNOHANG 1 // Do not block
Expand Down Expand Up @@ -41,4 +41,4 @@
#define P_PGID 2
#define P_PIDFD 3

#endif // __LLVM_LIBC_MACROS_LINUX_SYS_WAIT_MACROS_H
#endif // LLVM_LIBC_MACROS_LINUX_SYS_WAIT_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/linux/termios-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_LINUX_TERMIOS_MACROS_H
#define __LLVM_LIBC_MACROS_LINUX_TERMIOS_MACROS_H
#ifndef LLVM_LIBC_MACROS_LINUX_TERMIOS_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_TERMIOS_MACROS_H

// Below are generic definitions of symbolic bit-masks, modes etc. They serve
// most architectures including x86_64, aarch64 but have to be adjusted for few
Expand Down Expand Up @@ -164,4 +164,4 @@
#define TCIOFF 2 // Suspend output
#define TCION 3 // Restart output

#endif // __LLVM_LIBC_MACROS_LINUX_TERMIOS_MACROS_H
#endif // LLVM_LIBC_MACROS_LINUX_TERMIOS_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/linux/time-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_LINUX_TIME_MACROS_H
#define __LLVM_LIBC_MACROS_LINUX_TIME_MACROS_H
#ifndef LLVM_LIBC_MACROS_LINUX_TIME_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_TIME_MACROS_H

// clock type macros
#define CLOCK_REALTIME 0
Expand All @@ -23,4 +23,4 @@

#define CLOCKS_PER_SEC 1000000

#endif //__LLVM_LIBC_MACROS_LINUX_TIME_MACROS_H
#endif // LLVM_LIBC_MACROS_LINUX_TIME_MACROS_H
6 changes: 3 additions & 3 deletions libc/include/llvm-libc-macros/linux/unistd-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __LLVM_LIBC_MACROS_LINUX_UNISTD_MACROS_H
#define __LLVM_LIBC_MACROS_LINUX_UNISTD_MACROS_H
#ifndef LLVM_LIBC_MACROS_LINUX_UNISTD_MACROS_H
#define LLVM_LIBC_MACROS_LINUX_UNISTD_MACROS_H

// Values for mode argument to the access(...) function.
#define F_OK 0
Expand All @@ -27,4 +27,4 @@
(long)(arg4), (long)(arg5), (long)(arg6))
#define syscall(...) __syscall_helper(__VA_ARGS__, 0, 1, 2, 3, 4, 5, 6)

#endif // __LLVM_LIBC_MACROS_LINUX_UNISTD_MACROS_H
#endif // LLVM_LIBC_MACROS_LINUX_UNISTD_MACROS_H
Loading