Skip to content

Commit 7931aa1

Browse files
committed
Update native configs
1 parent fc09cfe commit 7931aa1

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

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

Lines changed: 4 additions & 4 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 x86_64-darwin17
47+
// Generated from tool/generate-native-config.rb on universal.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);
@@ -97,12 +97,12 @@ public static void load(NativeConfiguration configuration, RubyContext context)
9797
configuration.config("platform.ifaddrs.ifa_dstaddr.size", 8);
9898
configuration.config("platform.ifaddrs.ifa_dstaddr.type", string(context, "pointer"));
9999
configuration.config("platform.sockaddr.sizeof", 16);
100-
configuration.config("platform.sockaddr.sa_data.offset", 2);
101-
configuration.config("platform.sockaddr.sa_data.size", 14);
102-
configuration.config("platform.sockaddr.sa_data.type", string(context, "char_array"));
103100
configuration.config("platform.sockaddr.sa_family.offset", 1);
104101
configuration.config("platform.sockaddr.sa_family.size", 1);
105102
configuration.config("platform.sockaddr.sa_family.type", string(context, "sa_family_t"));
103+
configuration.config("platform.sockaddr.sa_data.offset", 2);
104+
configuration.config("platform.sockaddr.sa_data.size", 14);
105+
configuration.config("platform.sockaddr.sa_data.type", string(context, "char_array"));
106106
configuration.config("platform.sockaddr_in.sizeof", 16);
107107
configuration.config("platform.sockaddr_in.sin_family.offset", 1);
108108
configuration.config("platform.sockaddr_in.sin_family.size", 1);

src/main/java/org/truffleruby/platform/linux/LinuxNativeConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ public static void load(NativeConfiguration configuration, RubyContext context)
9797
configuration.config("platform.ifaddrs.ifa_dstaddr.size", 8);
9898
configuration.config("platform.ifaddrs.ifa_dstaddr.type", string(context, "pointer"));
9999
configuration.config("platform.sockaddr.sizeof", 16);
100-
configuration.config("platform.sockaddr.sa_data.offset", 2);
101-
configuration.config("platform.sockaddr.sa_data.size", 14);
102-
configuration.config("platform.sockaddr.sa_data.type", string(context, "char_array"));
103100
configuration.config("platform.sockaddr.sa_family.offset", 0);
104101
configuration.config("platform.sockaddr.sa_family.size", 2);
105102
configuration.config("platform.sockaddr.sa_family.type", string(context, "sa_family_t"));
103+
configuration.config("platform.sockaddr.sa_data.offset", 2);
104+
configuration.config("platform.sockaddr.sa_data.size", 14);
105+
configuration.config("platform.sockaddr.sa_data.type", string(context, "char_array"));
106106
configuration.config("platform.sockaddr_in.sizeof", 16);
107107
configuration.config("platform.sockaddr_in.sin_family.offset", 0);
108108
configuration.config("platform.sockaddr_in.sin_family.size", 2);
@@ -702,8 +702,8 @@ public static void load(NativeConfiguration configuration, RubyContext context)
702702
configuration.config("platform.clocks.CLOCK_MONOTONIC_RAW", 4);
703703
configuration.config("platform.clocks.CLOCK_PROCESS_CPUTIME_ID", 2);
704704
configuration.config("platform.clocks.CLOCK_REALTIME", 0);
705-
configuration.config("platform.clocks.CLOCK_REALTIME_COARSE", 5);
706705
configuration.config("platform.clocks.CLOCK_REALTIME_ALARM", 8);
706+
configuration.config("platform.clocks.CLOCK_REALTIME_COARSE", 5);
707707
configuration.config("platform.clocks.CLOCK_THREAD_CPUTIME_ID", 3);
708708
configuration.config("platform.typedef.int8_t", string(context, "char"));
709709
configuration.config("platform.typedef.int16_t", string(context, "short"));

0 commit comments

Comments
 (0)