From 9e9544fb95693c33fd644a39162331f7c325c3af Mon Sep 17 00:00:00 2001 From: g41797 Date: Fri, 19 May 2023 23:14:43 +0300 Subject: [PATCH] Changed placement of include files --- libs/arpa_inet.go | 2 +- libs/glob.go | 2 +- libs/{ => includes}/arpa_inet.h | 0 libs/includes/{ => embed}/AL/al.h | 0 libs/includes/{ => embed}/AL/alc.h | 0 libs/includes/{ => embed}/GL/gl.h | 0 libs/includes/{ => embed}/dirent.h | 0 libs/includes/{ => embed}/fcntl.h | 0 libs/includes/{ => embed}/float.h | 0 libs/includes/{ => embed}/getopt.h | 0 libs/includes/{ => embed}/inttypes.h | 0 libs/includes/{ => embed}/libgen.h | 0 libs/includes/{ => embed}/sched.h | 0 libs/includes/{ => embed}/semaphore.h | 0 libs/includes/{ => embed}/signal.h | 0 libs/includes/{ => embed}/strings.h | 0 libs/includes/{ => embed}/sys/mkdev.h | 0 libs/includes/{ => embed}/windows.h | 0 libs/{ => includes}/glob.h | 0 libs/{ => includes}/netdb.h | 0 libs/{ => includes}/pthread.h | 0 libs/{ => includes}/setjmp.h | 0 libs/{ => includes}/stdarg.h | 0 libs/{ => includes}/stdlib.h | 0 libs/{ => includes}/string.h | 0 libs/{ => includes}/sys_socket.h | 0 libs/{ => includes}/sys_stat.h | 0 libs/{ => includes}/sys_time.h | 0 libs/{ => includes}/sys_types.h | 0 libs/{ => includes}/time.h | 0 libs/{ => includes}/unistd.h | 0 libs/{ => includes}/wctype.h | 0 libs/netdb.go | 2 +- libs/pthread.go | 2 +- libs/reglibs.go | 2 +- libs/setjmp.go | 2 +- libs/stdarg.go | 2 +- libs/stdlib.go | 2 +- libs/string.go | 2 +- libs/sys_socket.go | 2 +- libs/sys_stat.go | 2 +- libs/sys_time.go | 2 +- libs/sys_types.go | 2 +- libs/time.go | 2 +- libs/unistd.go | 2 +- libs/wctype.go | 2 +- 46 files changed, 16 insertions(+), 16 deletions(-) rename libs/{ => includes}/arpa_inet.h (100%) rename libs/includes/{ => embed}/AL/al.h (100%) rename libs/includes/{ => embed}/AL/alc.h (100%) rename libs/includes/{ => embed}/GL/gl.h (100%) rename libs/includes/{ => embed}/dirent.h (100%) rename libs/includes/{ => embed}/fcntl.h (100%) rename libs/includes/{ => embed}/float.h (100%) rename libs/includes/{ => embed}/getopt.h (100%) rename libs/includes/{ => embed}/inttypes.h (100%) rename libs/includes/{ => embed}/libgen.h (100%) rename libs/includes/{ => embed}/sched.h (100%) rename libs/includes/{ => embed}/semaphore.h (100%) rename libs/includes/{ => embed}/signal.h (100%) rename libs/includes/{ => embed}/strings.h (100%) rename libs/includes/{ => embed}/sys/mkdev.h (100%) rename libs/includes/{ => embed}/windows.h (100%) rename libs/{ => includes}/glob.h (100%) rename libs/{ => includes}/netdb.h (100%) rename libs/{ => includes}/pthread.h (100%) rename libs/{ => includes}/setjmp.h (100%) rename libs/{ => includes}/stdarg.h (100%) rename libs/{ => includes}/stdlib.h (100%) rename libs/{ => includes}/string.h (100%) rename libs/{ => includes}/sys_socket.h (100%) rename libs/{ => includes}/sys_stat.h (100%) rename libs/{ => includes}/sys_time.h (100%) rename libs/{ => includes}/sys_types.h (100%) rename libs/{ => includes}/time.h (100%) rename libs/{ => includes}/unistd.h (100%) rename libs/{ => includes}/wctype.h (100%) diff --git a/libs/arpa_inet.go b/libs/arpa_inet.go index 8d4eed8..da9ed6e 100644 --- a/libs/arpa_inet.go +++ b/libs/arpa_inet.go @@ -13,7 +13,7 @@ const ( arpaInetH = "arpa/inet.h" ) -//go:embed arpa_inet.h +//go:embed includes/arpa_inet.h var harpaInet string func init() { diff --git a/libs/glob.go b/libs/glob.go index caa5f67..c9c8118 100644 --- a/libs/glob.go +++ b/libs/glob.go @@ -11,7 +11,7 @@ const ( globH = "glob.h" ) -//go:embed glob.h +//go:embed includes/glob.h var hglob string func init() { diff --git a/libs/arpa_inet.h b/libs/includes/arpa_inet.h similarity index 100% rename from libs/arpa_inet.h rename to libs/includes/arpa_inet.h diff --git a/libs/includes/AL/al.h b/libs/includes/embed/AL/al.h similarity index 100% rename from libs/includes/AL/al.h rename to libs/includes/embed/AL/al.h diff --git a/libs/includes/AL/alc.h b/libs/includes/embed/AL/alc.h similarity index 100% rename from libs/includes/AL/alc.h rename to libs/includes/embed/AL/alc.h diff --git a/libs/includes/GL/gl.h b/libs/includes/embed/GL/gl.h similarity index 100% rename from libs/includes/GL/gl.h rename to libs/includes/embed/GL/gl.h diff --git a/libs/includes/dirent.h b/libs/includes/embed/dirent.h similarity index 100% rename from libs/includes/dirent.h rename to libs/includes/embed/dirent.h diff --git a/libs/includes/fcntl.h b/libs/includes/embed/fcntl.h similarity index 100% rename from libs/includes/fcntl.h rename to libs/includes/embed/fcntl.h diff --git a/libs/includes/float.h b/libs/includes/embed/float.h similarity index 100% rename from libs/includes/float.h rename to libs/includes/embed/float.h diff --git a/libs/includes/getopt.h b/libs/includes/embed/getopt.h similarity index 100% rename from libs/includes/getopt.h rename to libs/includes/embed/getopt.h diff --git a/libs/includes/inttypes.h b/libs/includes/embed/inttypes.h similarity index 100% rename from libs/includes/inttypes.h rename to libs/includes/embed/inttypes.h diff --git a/libs/includes/libgen.h b/libs/includes/embed/libgen.h similarity index 100% rename from libs/includes/libgen.h rename to libs/includes/embed/libgen.h diff --git a/libs/includes/sched.h b/libs/includes/embed/sched.h similarity index 100% rename from libs/includes/sched.h rename to libs/includes/embed/sched.h diff --git a/libs/includes/semaphore.h b/libs/includes/embed/semaphore.h similarity index 100% rename from libs/includes/semaphore.h rename to libs/includes/embed/semaphore.h diff --git a/libs/includes/signal.h b/libs/includes/embed/signal.h similarity index 100% rename from libs/includes/signal.h rename to libs/includes/embed/signal.h diff --git a/libs/includes/strings.h b/libs/includes/embed/strings.h similarity index 100% rename from libs/includes/strings.h rename to libs/includes/embed/strings.h diff --git a/libs/includes/sys/mkdev.h b/libs/includes/embed/sys/mkdev.h similarity index 100% rename from libs/includes/sys/mkdev.h rename to libs/includes/embed/sys/mkdev.h diff --git a/libs/includes/windows.h b/libs/includes/embed/windows.h similarity index 100% rename from libs/includes/windows.h rename to libs/includes/embed/windows.h diff --git a/libs/glob.h b/libs/includes/glob.h similarity index 100% rename from libs/glob.h rename to libs/includes/glob.h diff --git a/libs/netdb.h b/libs/includes/netdb.h similarity index 100% rename from libs/netdb.h rename to libs/includes/netdb.h diff --git a/libs/pthread.h b/libs/includes/pthread.h similarity index 100% rename from libs/pthread.h rename to libs/includes/pthread.h diff --git a/libs/setjmp.h b/libs/includes/setjmp.h similarity index 100% rename from libs/setjmp.h rename to libs/includes/setjmp.h diff --git a/libs/stdarg.h b/libs/includes/stdarg.h similarity index 100% rename from libs/stdarg.h rename to libs/includes/stdarg.h diff --git a/libs/stdlib.h b/libs/includes/stdlib.h similarity index 100% rename from libs/stdlib.h rename to libs/includes/stdlib.h diff --git a/libs/string.h b/libs/includes/string.h similarity index 100% rename from libs/string.h rename to libs/includes/string.h diff --git a/libs/sys_socket.h b/libs/includes/sys_socket.h similarity index 100% rename from libs/sys_socket.h rename to libs/includes/sys_socket.h diff --git a/libs/sys_stat.h b/libs/includes/sys_stat.h similarity index 100% rename from libs/sys_stat.h rename to libs/includes/sys_stat.h diff --git a/libs/sys_time.h b/libs/includes/sys_time.h similarity index 100% rename from libs/sys_time.h rename to libs/includes/sys_time.h diff --git a/libs/sys_types.h b/libs/includes/sys_types.h similarity index 100% rename from libs/sys_types.h rename to libs/includes/sys_types.h diff --git a/libs/time.h b/libs/includes/time.h similarity index 100% rename from libs/time.h rename to libs/includes/time.h diff --git a/libs/unistd.h b/libs/includes/unistd.h similarity index 100% rename from libs/unistd.h rename to libs/includes/unistd.h diff --git a/libs/wctype.h b/libs/includes/wctype.h similarity index 100% rename from libs/wctype.h rename to libs/includes/wctype.h diff --git a/libs/netdb.go b/libs/netdb.go index 28a1d8e..a1c9074 100644 --- a/libs/netdb.go +++ b/libs/netdb.go @@ -11,7 +11,7 @@ const ( netdbH = "netdb.h" ) -//go:embed netdb.h +//go:embed includes/netdb.h var hnetdb string func init() { diff --git a/libs/pthread.go b/libs/pthread.go index ebd672c..18d9f38 100644 --- a/libs/pthread.go +++ b/libs/pthread.go @@ -11,7 +11,7 @@ const ( pthreadH = "pthread.h" ) -//go:embed pthread.h +//go:embed includes/pthread.h var hpthread string func init() { diff --git a/libs/reglibs.go b/libs/reglibs.go index 9658904..dbde302 100644 --- a/libs/reglibs.go +++ b/libs/reglibs.go @@ -7,7 +7,7 @@ import ( "strings" ) -//go:embed includes/* +//go:embed includes/embed/* var efs embed.FS func init() { diff --git a/libs/setjmp.go b/libs/setjmp.go index c485af5..3119ac2 100644 --- a/libs/setjmp.go +++ b/libs/setjmp.go @@ -10,7 +10,7 @@ const ( setjmpH = "setjmp.h" ) -//go:embed setjmp.h +//go:embed includes/setjmp.h var hsetjmp string func init() { diff --git a/libs/stdarg.go b/libs/stdarg.go index 7025fa8..a2ddfbe 100644 --- a/libs/stdarg.go +++ b/libs/stdarg.go @@ -6,7 +6,7 @@ const ( StdargH = "stdarg.h" ) -//go:embed stdarg.h +//go:embed includes/stdarg.h var hstdarg string func init() { diff --git a/libs/stdlib.go b/libs/stdlib.go index 9607be3..4fbb54a 100644 --- a/libs/stdlib.go +++ b/libs/stdlib.go @@ -12,7 +12,7 @@ import ( const StdlibH = "stdlib.h" -//go:embed stdlib.h +//go:embed includes/stdlib.h var hstdlib string // https://pubs.opengroup.org/onlinepubs/9699919799/ diff --git a/libs/string.go b/libs/string.go index 397e1fa..6f8f5d1 100644 --- a/libs/string.go +++ b/libs/string.go @@ -13,7 +13,7 @@ const ( stringH = "string.h" ) -//go:embed string.h +//go:embed includes/string.h var hstring string func init() { diff --git a/libs/sys_socket.go b/libs/sys_socket.go index 684edb5..1f83bd5 100644 --- a/libs/sys_socket.go +++ b/libs/sys_socket.go @@ -11,7 +11,7 @@ const ( sysSocketH = "sys/socket.h" ) -//go:embed sys_socket.h +//go:embed includes/sys_socket.h var hsys_socket string func init() { diff --git a/libs/sys_stat.go b/libs/sys_stat.go index 1dddfac..0f65eb8 100644 --- a/libs/sys_stat.go +++ b/libs/sys_stat.go @@ -11,7 +11,7 @@ const ( sysStatH = "sys/stat.h" ) -//go:embed sys_stat.h +//go:embed includes/sys_stat.h var hsys_stat string func init() { diff --git a/libs/sys_time.go b/libs/sys_time.go index 3112087..2305884 100644 --- a/libs/sys_time.go +++ b/libs/sys_time.go @@ -11,7 +11,7 @@ const ( sysTimeH = "sys/time.h" ) -//go:embed sys_time.h +//go:embed includes/sys_time.h var hsys_time string func init() { diff --git a/libs/sys_types.go b/libs/sys_types.go index beae1c6..4680a7e 100644 --- a/libs/sys_types.go +++ b/libs/sys_types.go @@ -11,7 +11,7 @@ const ( sysTypesH = "sys/types.h" ) -//go:embed sys_types.h +//go:embed includes/sys_types.h var hsysTypes string func init() { diff --git a/libs/time.go b/libs/time.go index b47fbbe..30ea762 100644 --- a/libs/time.go +++ b/libs/time.go @@ -11,7 +11,7 @@ const ( timeH = "time.h" ) -//go:embed time.h +//go:embed includes/time.h var htime string func init() { diff --git a/libs/unistd.go b/libs/unistd.go index dd21044..a66e155 100644 --- a/libs/unistd.go +++ b/libs/unistd.go @@ -12,7 +12,7 @@ const ( unistdH = "unistd.h" ) -//go:embed unistd.h +//go:embed includes/unistd.h var hunistd string func init() { diff --git a/libs/wctype.go b/libs/wctype.go index 5e3d8c2..e4f1d3f 100644 --- a/libs/wctype.go +++ b/libs/wctype.go @@ -14,7 +14,7 @@ const ( wctypeH = "wctype.h" ) -//go:embed wctype.h +//go:embed includes/wctype.h var hwctype string func init() {