diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-05-06 17:42:58 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-05-06 17:42:58 +0200 |
| commit | ea3024202d8dfedfafa62a15286157d3843957cb (patch) | |
| tree | 35e3bb9c80eba604aa7bcd460c657658171cda20 /lib | |
| parent | 60c5ebfa0f56b5e1791b2fd408c243d6a280a393 (diff) | |
| parent | 691f8f7f180e970aea155d1741cd9f5e66741a20 (diff) | |
| download | otp-ea3024202d8dfedfafa62a15286157d3843957cb.tar.gz otp-ea3024202d8dfedfafa62a15286157d3843957cb.tar.bz2 otp-ea3024202d8dfedfafa62a15286157d3843957cb.zip | |
Merge branch 'nox/fix-warnings/OTP-11086' into maint
* nox/fix-warnings/OTP-11086:
Fix some sign warnings found with Clang
Fix a shift/reduce conflicts warning in icparse
Fix two deprecation warnings in com.ericsson.otp.ic.Environment
Define matherr only on platforms where it is used
Properly declare _sigaction on Darwin
Properly mark Uint literals as unsigned in big.c
Do not use -mdynamic-no-pic on Darwin
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ic/java_src/com/ericsson/otp/ic/Environment.java | 4 | ||||
| -rw-r--r-- | lib/ic/src/icparse.yrl | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Environment.java b/lib/ic/java_src/com/ericsson/otp/ic/Environment.java index fff854a5f8..4b321fbce7 100644 --- a/lib/ic/java_src/com/ericsson/otp/ic/Environment.java +++ b/lib/ic/java_src/com/ericsson/otp/ic/Environment.java @@ -135,8 +135,8 @@ public class Environment { if (connection == null) connection = self.connect(peer); - clientP = new com.ericsson.otp.erlang.OtpErlangPid(self); /* This is not perfect */ - send_ref = new com.ericsson.otp.erlang.OtpErlangRef(self); + clientP = self.createPid(); /* This is not perfect */ + send_ref = self.createRef(); } diff --git a/lib/ic/src/icparse.yrl b/lib/ic/src/icparse.yrl index d0dd6cde4c..b0286d57f4 100644 --- a/lib/ic/src/icparse.yrl +++ b/lib/ic/src/icparse.yrl @@ -230,6 +230,9 @@ Terminals Rootsymbol '<specification>'. +Expect 9. + + %%------------------------------------------------------------ %% Clauses %% |