update header guard convention

include/fcntl.h

@@ -1,5 +1,5 @@
-#ifndef __LIB_FCNTL_H__
-# define __LIB_FCNTL_H__
+#ifndef __FCNTL_H__
+# define __FCNTL_H__
 
 #include <stddef.h>
 #include <stdint.h>
@@ -17,4 +17,4 @@
 */
 extern int open(const char *pathname, int flags, ...);
 
-#endif /*__LIB_FCNTL_H__*/
+#endif /*__FCNTL_H__*/

include/setjmp.h

@@ -1,5 +1,5 @@
-#ifndef __LIB_SETJMP_H__
-# define __LIB_SETJMP_H__
+#ifndef __SETJMP_H__
+# define __SETJMP_H__
 
 #include <stddef.h>
 #include <stdint.h>
@@ -23,4 +23,4 @@ extern int setjmp(jmp_buf env);
 */
 extern void longjmp(jmp_buf env, int val);
 
-#endif /*__LIB_SETJMP_H__*/
+#endif /*__SETJMP_H__*/

include/signal.h

@@ -1,5 +1,5 @@
-#ifndef __LIB_SIGNAL_H__
-# define __LIB_SIGNAL_H__
+#ifndef __SIGNAL_H__
+# define __SIGNAL_H__
 
 #include <stddef.h>
 #include <stdint.h>
@@ -37,4 +37,4 @@ extern int kill(pid_t pid, int sig);
 */
 extern void (*signal(int signum, void (*handler)(int)))(int);
 
-#endif /*__LIB_SIGNAL_H__*/
+#endif /*__SIGNAL_H__*/

include/stdio.h

@@ -1,5 +1,5 @@
-#ifndef __LIB_STDIO_H__
-# define __LIB_STDIO_H__
+#ifndef __STDIO_H__
+# define __STDIO_H__
 
 #include <stddef.h>
 #include <stdint.h>
@@ -18,4 +18,4 @@ extern int vsnprintf(char *restrict str, size_t size, const char *restrict forma
 extern int putchar(int c);
 extern int puts(const char *s);
 
-#endif /*__LIB_STDIO_H__*/
+#endif /*__STDIO_H__*/

include/stdlib.h

@@ -1,5 +1,5 @@
-#ifndef __LIB_STDLIB_H__
-# define __LIB_STDLIB_H__
+#ifndef __STDLIB_H__
+# define __STDLIB_H__
 
 #include <stddef.h>
 #include <stdint.h>
@@ -28,4 +28,4 @@ extern void *reallocarray(void *ptr, size_t nmemb, size_t size);
 /* Free a block allocated by `malloc', `realloc' or `calloc'. */
 extern void free(void *ptr);
 
-#endif /*__LIB_STDLIB_H__*/
+#endif /*__STDLIB_H__*/

include/sys/mman.h

@@ -1,5 +1,5 @@
-#ifndef __LIB_SYS_MMAN_H__
-# define __LIB_SYS_MMAN_H__
+#ifndef __SYS_MMAN_H__
+# define __SYS_MMAN_H__
 
 #include <stddef.h>
 #include <stdint.h>
@@ -55,4 +55,4 @@ extern void *mmap(void *addr, size_t length, int prot, int flags, int fd, off_t
 */
 extern int munmap(void *addr, size_t length);
 
-#endif /*__LIB_SYS_MMAN_H__*/
+#endif /*__SYS_MMAN_H__*/

include/sys/stat.h

@@ -1,5 +1,5 @@
-#ifndef __KERNEL_FS_STAT_H__
-# define __KERNEL_FS_STAT_H__
+#ifndef __SYS_STAT_H__
+# define __SYS_STAT_H__
 
 /* File types.  */
 #define	__S_IFMT	0170000	/* These bits determine file type.  */
@@ -37,4 +37,4 @@
 /* Read, write, and execute by others.  */
 #define	S_IRWXO	(S_IRWXG >> 3)
 
-#endif /*__KERNEL_FS_STAT_H__*/
+#endif /*__SYS_STAT_H__*/

include/sys/syscall.h

@@ -1,5 +1,5 @@
-#ifndef __SYSCALL_H__
-# define __SYSCALL_H__
+#ifndef __SYS_SYSCALL_H__
+# define __SYS_SYSCALL_H__
 
 /*
 ** This file should list the numbers of the system calls the system knows.
@@ -15,4 +15,4 @@
 */
 #include <bits/syscall.h>
 
-#endif
+#endif /*__SYS_SYSCALL_H__*/

include/sys/types.h

@@ -1,5 +1,5 @@
-#ifndef __TYPES_H__
-# define __TYPES_H__
+#ifndef __SYS_TYPES_H__
+# define __SYS_TYPES_H__
 
 #include <stddef.h>
 #include <stdint.h>
@@ -23,4 +23,4 @@ typedef int16_t mode_t;
 typedef uint16_t dev_t;
 typedef uint16_t umode_t;
 
-#endif /*__TYPES_H__*/
+#endif /*__SYS_TYPES_H__*/

include/sys/wait.h

@@ -1,5 +1,5 @@
-#ifndef __LIB_SYS_WAIT_H__
-# define __LIB_SYS_WAIT_H__
+#ifndef __SYS_WAIT_H__
+# define __SYS_WAIT_H__
 
 #include <stddef.h>
 #include <stdint.h>
@@ -46,4 +46,4 @@ extern pid_t waitpid(pid_t pid, int *wstatus, int options);
 */
 extern pid_t wait(int *wstatus);
 
-#endif /*__LIB_SYS_WAIT_H__*/
+#endif /*__SYS_WAIT_H__*/

include/target/casiowin-cg/bits/__trapa.h

@@ -1,5 +1,5 @@
-#ifndef __FXLIBC_TARGET_CASIOWIN_CG_TRAPA_H__
-# define __FXLIBC_TARGET_CASIOWIN_CG_TRAPA_H__
+#ifndef __BITS_TRAPA_H__
+# define __BITS_TRAPA_H__
 
 /*
 ** Normally the SH3/SH4 processor provide a "trapa" instruction which allow
@@ -19,4 +19,4 @@
 syscall_table:	.long 0x80020070	;\
 syscall_id:	.long id
 
-#endif /*__FXLIBC_TARGET_CASIOWIN_CG_TRAPA_H__*/
+#endif /*__BITS_TRAPA_H__*/

include/target/casiowin-cg/bits/unistd_32.h

@@ -1,5 +1,5 @@
-#ifndef __ASM_UNISTD32_FXCG50_H__
-# define __ASM_UNISTD32_FXCG50_H__
+#ifndef __BITS_UNISTD_32_H__
+# define __BITS_UNISTD_32_H__
 
 // File manipulation
 #define __NR_BFile_Remove	0x00001db4
@@ -31,4 +31,4 @@
 #define __NR_Timer_Start	0x000008db
 #define __NR_Timer_Stop		0x000008dc
 
-#endif /*__ASM_UNISTD32_FXCG50_H__*/
+#endif /*__BITS_UNISTD_32_H__*/

include/target/casiowin-fx/bits/trapa.h

@@ -1,5 +1,5 @@
-#ifndef __FXLIBC_TARGET_CASIOWIN_FX_TRAPA_H__
-# define __FXLIBC_TARGET_CASIOWIN_FX_TRAPA_H__
+#ifndef __BITS_TRAPA_H__
+# define __BITS_TRAPA_H__
 
 /*
 ** Normally the SH3/SH4 processor provide a "trapa" instruction which allow
@@ -19,4 +19,4 @@
 syscall_table:	.long 0x80010070	;\
 syscall_id:	.long id
 
-#endif /*__FXLIBC_TARGET_CASIOWIN_FX_TRAPA_H__*/
+#endif /*__BITS_TRAPA_H__*/

include/target/casiowin-fx/bits/unistd_32.h

@@ -1,5 +1,5 @@
-#ifndef __ASM_UNISTD32_FX9860G_H__
-# define __ASM_UNISTD32_FX9860G_H__
+#ifndef __BITS_UNISTD_32_H__
+# define __BITS_UNISTD_32_H__
 
 // File manipulation
 #define __NR_Bfile_CreateFile	0x00000434
@@ -54,4 +54,4 @@
 // power management
 #define __NR_PowerOff		0x000003f4
 
-#endif /*__ASM_UNISTD32_FX9860G_H__*/
+#endif /*__BITS_UNISTD_32__*/

include/target/vhex-generic/bits/asm/unistd_32.h

@@ -1,5 +1,5 @@
-#ifndef __ASM_UNISTD32_VHEX_H__
-# define __ASM_UNISTD32_VHEX_H__
+#ifndef __BITS_ASM_UNISTD_32_H__
+# define __BITS_ASM_UNISTD_32_H__
 
 // Define the number of syscall
 #define __NR_MAX		21
@@ -42,4 +42,4 @@
 #define __NR_proc_heap_free	26 // (custom)
 #define __NR_proc_heap_realloc	27 // (custom)
 
-#endif /*__ASM_UNISTD32_VHEX_H__*/
+#endif /*__BITS_ASM_UNISTD_32_H__*/

include/target/vhex-generic/bits/signum.h

@@ -1,5 +1,5 @@
-#ifndef __LIB_BITS_SIGNUM_H__
-# define __LIB_BITS_SIGNUM_H__
+#ifndef __BITS_SIGNUM_H__
+# define __BITS_SIGNUM_H__
 
 // Define the number of signals
 #define NSIG		32
@@ -47,4 +47,4 @@
 #define	SIGUSR1		30	/* User-defined signal 1.  */
 #define	SIGUSR2		31	/* User-defined signal 2.  */
 
-#endif /*__LIB_BITS_SIGNUM_H__*/
+#endif /*__BITS_SIGNUM_H__*/

include/target/vhex-generic/bits/types/__FILE.h

@@ -1,8 +1,8 @@
-#ifndef __BITS_TYPES__FILE_H__
-# define ___LIB_BITS_TYPES__FILE_H__
+#ifndef __BITS_TYPES___FILE_H__
+# define ___BITS_TYPES___FILE_H__
 
 // define opaque definition of the FILE type
 struct _IO_FILE;
 typedef struct _IO_FILE __FILE;
 
-#endif /*__BITS_TYPES__FILE_H__*/
+#endif /*__BITS_TYPES___FILE_H__*/

include/target/vhex-generic/bits/types/struct_FILE.h

@@ -1,5 +1,5 @@
-#ifndef __FILE_H__
-# define __FILE_H__
+#ifndef __BITS_TYPES_STRUCT_FILE_H__
+# define __BITS_TYPES_STRUCT_FILE_H__
 
 #include <stdint.h>
 #include <stddef.h>
@@ -23,4 +23,4 @@ struct _IO_FILE
     void *private;
 };
 
-#endif /*__FILE_H__*/
+#endif /*__BITS_TYPES_STRUCT_FILE_H__*/

include/target/vhex-generic/bits/waitflags.h

@@ -1,9 +1,9 @@
-#ifndef __LIB_BITS_WAITFLAGS_H__
-# define __LIB_BITS_WAITFLAGS_H__
+#ifndef __BITS_WAITFLAGS_H__
+# define __BITS_WAITFLAGS_H__
 
 /* Bits in the third argument to `waitpid'. */
 #define	WNOHANG		1	/* Don't block waiting. */
 #define	WUNTRACED	2	/* Report status of stopped child. */
 #define	WCONTINUED	3	/* Report continued child. */
 
-#endif /*__LIB_BITS_WAITFLAGS_H__*/
+#endif /*__BITS_WAITFLAGS_H__*/

include/target/vhex-generic/bits/waitstatus.h

@@ -1,5 +1,5 @@
-#ifndef __LIB_BITS_WAITSTATUS_H__
-# define __LIB_BITS_WAITSTATUS_H__
+#ifndef __BITS_WAITSTATUS_H__
+# define __BITS_WAITSTATUS_H__
 
 /* If WIFEXITED(STATUS), the low-order 8 bits of the status. */
 #define	__WEXITSTATUS(status)	(((status) & 0xff00) >> 8)
@@ -32,4 +32,4 @@
 #define __W_CONTINUED		0xffff
 #define	__WCOREFLAG		0x80
 
-#endif /*__LIB_BITS_WAITSTATUS_H__*/
+#endif /*__BITS_WAITSTATUS_H__*/

include/threads.h

@@ -1,5 +1,5 @@
-#ifndef __LIB_PTHREAD_H__
-# define __LIB_PTHREAD_H__
+#ifndef __THREADS_H__
+# define __THREADS_H__
 
 #include <stddef.h>
 #include <stdint.h>
@@ -74,4 +74,4 @@ extern uint32_t __thread_atomic_start(void);
 */
 extern uint32_t __thread_atomic_stop(void);
 
-#endif /*__LIB_PTHREAD_H__*/
+#endif /*__THREADS_H__*/

include/unistd.h

@@ -1,5 +1,5 @@
-#ifndef __LIB_UNISTD_H__
-# define __LIB_UNISTD_H__
+#ifndef __UNISTD_H__
+# define __UNISTD_H__
 
 #include <stddef.h>
 #include <stdint.h>
@@ -88,4 +88,4 @@ extern int close(int __fd);
 /* Get the value of the system variable NAME. */
 extern long int sysconf(int __name);
 
-#endif /*__LIB_UNISTD_H__*/
+#endif /*__UNISTD_H__*/