Skip to content

Commit 0a2f73a

Browse files
committed
Add stddef.h to native config (only run on macOS)
1 parent d9f6509 commit 0a2f73a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/main/java/org/truffleruby/platform/darwin/DarwinNativeConfiguration.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
public class DarwinNativeConfiguration extends DefaultNativeConfiguration {
4545

4646
public static void load(NativeConfiguration configuration, RubyContext context) {
47-
// Generated from tool/generate-native-config.rb on universal.x86_64-darwin18
47+
// Generated from tool/generate-native-config.rb on x86_64-darwin18
4848
configuration.config("platform.sigaction.sizeof", 16);
4949
configuration.config("platform.sigaction.sa_handler.offset", 0);
5050
configuration.config("platform.sigaction.sa_handler.size", 8);
@@ -650,6 +650,10 @@ public static void load(NativeConfiguration configuration, RubyContext context)
650650
configuration.config("platform.typedef.intptr_t", string(context, "long"));
651651
configuration.config("platform.typedef.intmax_t", string(context, "long"));
652652
configuration.config("platform.typedef.uintmax_t", string(context, "ulong"));
653+
configuration.config("platform.typedef.ptrdiff_t", string(context, "long"));
654+
configuration.config("platform.typedef.size_t", string(context, "ulong"));
655+
configuration.config("platform.typedef.rsize_t", string(context, "ulong"));
656+
configuration.config("platform.typedef.wchar_t", string(context, "int"));
653657
configuration.config("platform.typedef.u_char", string(context, "uchar"));
654658
configuration.config("platform.typedef.u_short", string(context, "ushort"));
655659
configuration.config("platform.typedef.u_int", string(context, "uint"));
@@ -680,12 +684,10 @@ public static void load(NativeConfiguration configuration, RubyContext context)
680684
configuration.config("platform.typedef.swblk_t", string(context, "int"));
681685
configuration.config("platform.typedef.uid_t", string(context, "uint"));
682686
configuration.config("platform.typedef.clock_t", string(context, "ulong"));
683-
configuration.config("platform.typedef.size_t", string(context, "ulong"));
684687
configuration.config("platform.typedef.ssize_t", string(context, "long"));
685688
configuration.config("platform.typedef.time_t", string(context, "long"));
686689
configuration.config("platform.typedef.useconds_t", string(context, "uint"));
687690
configuration.config("platform.typedef.suseconds_t", string(context, "int"));
688-
configuration.config("platform.typedef.rsize_t", string(context, "ulong"));
689691
configuration.config("platform.typedef.errno_t", string(context, "int"));
690692
configuration.config("platform.typedef.fd_mask", string(context, "int"));
691693
configuration.config("platform.typedef.pthread_key_t", string(context, "ulong"));

tool/generate-native-config.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ def initialize
357357

358358
def source(io)
359359
io.puts '#include <stdint.h>'
360+
io.puts '#include <stddef.h>'
360361
io.puts '#include <sys/types.h>'
361362
io.puts '#include <sys/socket.h>'
362363
io.puts '#include <sys/resource.h>'

0 commit comments

Comments
 (0)