diff --git a/CCore/include/CCore.h b/CCore/include/CCore.h index 24eb3150..7234ef2c 100644 --- a/CCore/include/CCore.h +++ b/CCore/include/CCore.h @@ -47,8 +47,4 @@ #define AK_GET_EXISTING_CLOSED_ENUM_MACRO(_1,_2,NAME,...) NAME #define AK_EXISTING_CLOSED_ENUM(...) AK_GET_EXISTING_CLOSED_ENUM_MACRO(__VA_ARGS__, AK_EXISTING_CLOSED_ENUM_TYPED, AK_EXISTING_CLOSED_ENUM_IMPLICIT)(__VA_ARGS__) -#if defined(__linux__) && !defined(_GNU_SOURCE) -#define _GNU_SOURCE -#endif - #endif diff --git a/CairoGraphics/Sources/CPango/CPango_umbrella.h b/CairoGraphics/Sources/CPango/CPango_umbrella.h index ab084f6c..061a42a8 100644 --- a/CairoGraphics/Sources/CPango/CPango_umbrella.h +++ b/CairoGraphics/Sources/CPango/CPango_umbrella.h @@ -8,6 +8,8 @@ #ifndef CPango_umbrella_h #define CPango_umbrella_h 1 +#include "../../../CCore/include/CCore.h" + struct _PangoLayout {}; struct _PangoFontDescription {}; struct _PangoContext {}; @@ -15,6 +17,4 @@ struct _PangoContext {}; #include #include -#include "../../../CCore/include/CCore.h" - #endif diff --git a/Package.resolved b/Package.resolved index 7d27d568..e9402503 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,7 +6,7 @@ "location" : "https://github.com/recp/cglm", "state" : { "branch" : "master", - "revision" : "cb4a1b2677eaf3bcf6e8039db2bd0c054355052f" + "revision" : "d93b46bab709c80c3c738462134ae96724e60f5c" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-argument-parser", "state" : { - "revision" : "fee6933f37fde9a5e12a1e4aeaa93fe60116ff2a", - "version" : "1.2.2" + "revision" : "8f4d2753f0e4778c76d5f05ad16c74f707390531", + "version" : "1.2.3" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-atomics.git", "state" : { - "revision" : "6c89474e62719ddcc1e9614989fff2f68208fe10", - "version" : "1.1.0" + "revision" : "cd142fd2f64be2100422d658e7411e39489da985", + "version" : "1.2.0" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections", "state" : { - "revision" : "937e904258d22af6e447a0b72c0bc67583ef64a2", - "version" : "1.0.4" + "revision" : "a902f1823a7ff3c9ab2fba0f992396b948eda307", + "version" : "1.0.5" } }, { @@ -78,7 +78,7 @@ "location" : "https://github.com/apple/swift-tools-support-core", "state" : { "branch" : "main", - "revision" : "ef2db24dbe7e39ebfabca2c10905909708c5738b" + "revision" : "3b13e439a341bbbfe0f710c7d1be37221745ef1a" } }, { diff --git a/Package.swift b/Package.swift index 8367a53c..80081a68 100755 --- a/Package.swift +++ b/Package.swift @@ -106,11 +106,11 @@ let package = Package( // .library(.cGLib), // .library(.swiftyGLib, type: .dynamic), - .library(.linuxSys), + .library(.linuxSys, type: .static), .library(.tinyFoundation), - .library(.cVulkan), + .library(.cVulkan, type: .static), .library(.volcano, type: .dynamic), .library(.vulkanMemoryAllocatorAdapted, type: .static), ] + { @@ -489,7 +489,7 @@ extension Target { } extension Target { - static let linuxSys: Target = systemLibrary( + static let linuxSys: Target = target( name: "LinuxSys", path: "Sys/Sources/LinuxSys" ) diff --git a/SwiftXlib/Sources/CXlib/CXlib_umbrella.h b/SwiftXlib/Sources/CXlib/CXlib_umbrella.h index 58fad19e..6bec8756 100644 --- a/SwiftXlib/Sources/CXlib/CXlib_umbrella.h +++ b/SwiftXlib/Sources/CXlib/CXlib_umbrella.h @@ -8,6 +8,8 @@ #ifndef CXlib_umbrella_h #define CXlib_umbrella_h 1 +#include "../../../CCore/include/CCore.h" + #ifndef XLIB_ILLEGAL_ACCESS #define XLIB_ILLEGAL_ACCESS 1 #endif @@ -32,8 +34,6 @@ struct _XIC {}; #include #include -#include "../../../CCore/include/CCore.h" - #include "XlibResult.h" #include "XlibEventKeyMask.h" #include "XlibEventButtonMask.h" diff --git a/Sys/Package.swift b/Sys/Package.swift index d4092a42..2dd64462 100644 --- a/Sys/Package.swift +++ b/Sys/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.7 +// swift-tools-version: 5.8 // // Package.swift // Sys diff --git a/Sys/Sources/LinuxSys/LinuxSysEmpty.c b/Sys/Sources/LinuxSys/LinuxSysEmpty.c new file mode 100644 index 00000000..e308ffcd --- /dev/null +++ b/Sys/Sources/LinuxSys/LinuxSysEmpty.c @@ -0,0 +1,9 @@ +// +// LinuxSysEmpty.c +// Sys +// +// Created by Serhii Mumriak on 19.10.2023 +// + +#define _GNU_SOURCE +#include "include/LinuxSys.h" diff --git a/Sys/Sources/LinuxSys/LinuxSys_umbrella.h b/Sys/Sources/LinuxSys/include/LinuxSys.h similarity index 72% rename from Sys/Sources/LinuxSys/LinuxSys_umbrella.h rename to Sys/Sources/LinuxSys/include/LinuxSys.h index 9a45bc3c..31ca8fc7 100644 --- a/Sys/Sources/LinuxSys/LinuxSys_umbrella.h +++ b/Sys/Sources/LinuxSys/include/LinuxSys.h @@ -8,7 +8,7 @@ #ifndef LinuxSys_umbrella_h #define LinuxSys_umbrella_h 1 -#include "../../../CCore/include/CCore.h" +#include "../../../../CCore/include/CCore.h" #ifdef __linux__ @@ -37,6 +37,12 @@ AK_EXISTING_OPTIONS(EPOLL_EVENTS); #include "wait_macros.h" +extern __pid_t gettid (void) __THROW; +extern int ppoll (struct pollfd *__fds, nfds_t __nfds, + const struct timespec *__timeout, + const __sigset_t *__ss) + __fortified_attr_access (__write_only__, 1, 2); + #endif #endif diff --git a/Sys/Sources/LinuxSys/wait_macros.h b/Sys/Sources/LinuxSys/include/wait_macros.h similarity index 100% rename from Sys/Sources/LinuxSys/wait_macros.h rename to Sys/Sources/LinuxSys/include/wait_macros.h diff --git a/Sys/Sources/LinuxSys/module.modulemap b/Sys/Sources/LinuxSys/module.modulemap deleted file mode 100644 index 0c651489..00000000 --- a/Sys/Sources/LinuxSys/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -// -// module.modulemap -// LinuxSys -// -// Created by Serhii Mumriak on 11.01.2023 -// - -module LinuxSys [system] [extern_c] { - header "LinuxSys_umbrella.h" - export * -} \ No newline at end of file diff --git a/Volcano/Sources/CClang/CClang_umbrella.h b/Volcano/Sources/CClang/CClang_umbrella.h index 8ff05f1a..e605df07 100644 --- a/Volcano/Sources/CClang/CClang_umbrella.h +++ b/Volcano/Sources/CClang/CClang_umbrella.h @@ -8,10 +8,10 @@ #ifndef CClang_umbrella_h #define CClang_umbrella_h 1 -struct CXTranslationUnitImpl {}; - #include "../../../CCore/include/CCore.h" +struct CXTranslationUnitImpl {}; + AK_EXISTING_ENUM(CXCursorKind); AK_EXISTING_ENUM(CXChildVisitResult); AK_EXISTING_ENUM(CXTypeKind);