Skip to content

Commit

Permalink
Merge pull request RfidResearchGroup#2025 from The-SamminAter/patch-1
Browse files Browse the repository at this point in the history
Fix compiling liblua on iOS
  • Loading branch information
iceman1001 authored Jul 9, 2023
2 parents e43f680 + 013a267 commit e86eaf1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...

## [unreleased][unreleased]
- Fix compiling liblua on iOS (@The-SamminAter)
- Fixed the timeout of TCP connections (@wh201906)
- Made the connection timeout configurable (@wh201906)

Expand Down
3 changes: 0 additions & 3 deletions client/deps/liblua/luaconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@

#if defined(__APPLE__)
#include "TargetConditionals.h"
#if TARGET_OS_IOS || TARGET_OS_WATCH || TARGET_OS_TV
#define system(s) ((s)==NULL ? 0 : -1)
#endif // end iOS
#endif

#include <limits.h>
Expand Down

0 comments on commit e86eaf1

Please sign in to comment.