diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2022-02-10 13:57:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 13:57:59 -0500 |
| commit | 15f07d14b5f048dc355536cbdf5cf9c10291b13b (patch) | |
| tree | a60f6b7929d6cf1301c8b0dff57f675df8ee5339 /source | |
| parent | b8982fcf43b86c1e39dcc3dd19bff2821633eda6 (diff) | |
Fix MacOSX build issues (#2124)
* #include an absolute path didn't work - because paths were taken to always be relative.
* Small fixes.
Added compiler crash with generic defined in a function.
Added enum-flags test that works (by limiting backing type to int), and using __EnumType constraint.
* Add comment about crash.
* Disable crashing test.
* Fixes to make compile on OSX.
* Add github build for OSX.
* Make premake generator a utility.
* Fix osx compilation issue.
* More fixes for OSX build.
* OSX fix due to ambiguity around size_t and integer types.
* Disable xlib on build on osx.
* Use 'prebuildcommands' to make prebuild make utility projects do something.
* Small fixes for premake so utility works on linux/osx.
* Another hack to try and make generators run when 'utility'
* Fix typo in macos.yml.
* Revert premake to old style, and disable stdlib embedding on OSX.
Diffstat (limited to 'source')
| -rw-r--r-- | source/core/slang-http.cpp | 2 | ||||
| -rw-r--r-- | source/core/unix/slang-unix-process.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source/core/slang-http.cpp b/source/core/slang-http.cpp index bb5994635..3da22ba9c 100644 --- a/source/core/slang-http.cpp +++ b/source/core/slang-http.cpp @@ -158,7 +158,7 @@ void HTTPHeader::reset() void HTTPHeader::append(StringBuilder& out) const { // Output the content length - out << g_contentLength << ": " << m_contentLength << "\r\n"; + out << g_contentLength << ": " << SlangSizeT(m_contentLength) << "\r\n"; // If either is set construct a content type if (m_mimeType.getLength() || m_encoding.getLength()) diff --git a/source/core/unix/slang-unix-process.cpp b/source/core/unix/slang-unix-process.cpp index 1f58f5725..991d905d9 100644 --- a/source/core/unix/slang-unix-process.cpp +++ b/source/core/unix/slang-unix-process.cpp @@ -19,6 +19,10 @@ #include <sys/wait.h> #include <unistd.h> +#if SLANG_OSX +# include <signal.h> +#endif + #include <time.h> namespace Slang { |