Skip to content

Commit d86b483

Browse files
committed
unistd.h is required on Big Sur since the compiler will no longer tolerate
implciit declarations.
1 parent 400dfa3 commit d86b483

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

build.macos32x86/common/Makefile.app

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ $(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib
160160
$(XCUB)/ibtool --errors --warnings --notices --module $(VM) \
161161
--minimum-deployment-target $(TARGET_VERSION_MIN) \
162162
--auto-activate-custom-fonts --output-format human-readable-text \
163-
--compile $(VMMENUNIB) \
164-
$(PLATDIR)/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib
163+
--compile $(VMMENUNIB) $<
165164

166165
$(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns
167166
@mkdir -p $(APP)/Contents/Resources

build.macos64ARMv8/common/Makefile.app

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,12 @@ $(VMLOCALIZATION): $(OSXCOMMONDIR)/English.lproj/$(SYSTEM)-Localizable.strings
155155
@mkdir -p $(dir $@)
156156
cp -p $< $@
157157

158-
$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib
158+
$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib
159159
@mkdir -p $(dir $@)
160160
$(XCUB)/ibtool --errors --warnings --notices --module $(VM) \
161161
--minimum-deployment-target $(TARGET_VERSION_MIN) \
162162
--auto-activate-custom-fonts --output-format human-readable-text \
163-
--compile $(VMMENUNIB) \
164-
$(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib
163+
--compile $(VMMENUNIB) $<
165164

166165
$(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns
167166
@mkdir -p $(APP)/Contents/Resources

build.macos64x64/common/Makefile.app

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ $(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib
160160
$(XCUB)/ibtool --errors --warnings --notices --module $(VM) \
161161
--minimum-deployment-target $(TARGET_VERSION_MIN) \
162162
--auto-activate-custom-fonts --output-format human-readable-text \
163-
--compile $(VMMENUNIB) \
164-
$(PLATDIR)/iOS/vm/English.lproj/$(SYSTEM)-MainMenu.xib
163+
--compile $(VMMENUNIB) $<
165164

166165
$(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns
167166
@mkdir -p $(APP)/Contents/Resources

platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "sq.h"
3535

3636
#include <errno.h>
37+
#include <unistd.h> // required on BigSur
3738

3839
#ifndef NO_STD_FILE_SUPPORT
3940

platforms/unix/plugins/SecurityPlugin/sqUnixSecurity.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "sq.h"
1616
#include "SecurityPlugin.h"
1717

18+
#include <unistd.h>
1819
#include <sys/param.h>
1920

2021
static char secureUserDirectory[MAXPATHLEN+1]; /* imagepath/secure/ */

platforms/unix/vm/sqUnixThreads.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717

1818
#include "sq.h"
1919

20+
#include <unistd.h> /* for ioNumProcesors & sleep */
21+
2022
#if COGMTVM
2123

22-
#include <unistd.h> /* for ioNumProcesors */
2324
#include <sys/types.h> /* for ioNumProcesors */
2425
#if __linux__
2526
# include <linux/sysctl.h> /* for ioNumProcesors */

0 commit comments

Comments
 (0)