aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-03-25 13:12:16 +0100
committerJohn Högberg <[email protected]>2019-03-25 13:12:16 +0100
commit54d1b47d1e845838584de9660788f2f64ad46e90 (patch)
tree2f77f9d6a56e32d09520c1ee3d580a7537a4aa3a
parent11f87e326da88b9658e824832fd1dbc996f27cc3 (diff)
parent81a8b0e0674d21b3bd8f5f6ea35eefe4fcd327d9 (diff)
downloadotp-54d1b47d1e845838584de9660788f2f64ad46e90.tar.gz
otp-54d1b47d1e845838584de9660788f2f64ad46e90.tar.bz2
otp-54d1b47d1e845838584de9660788f2f64ad46e90.zip
Merge branch 'john/erts/fix-ticket-syntax-error'
* john/erts/fix-ticket-syntax-error: erts: Fix version error in erl_nif.h
-rw-r--r--erts/emulator/beam/erl_nif.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h
index a599511c78..7c6d52f525 100644
--- a/erts/emulator/beam/erl_nif.h
+++ b/erts/emulator/beam/erl_nif.h
@@ -59,12 +59,17 @@
*/
#define ERL_NIF_MAJOR_VERSION 2
#define ERL_NIF_MINOR_VERSION 15
+
/*
- * WHEN CHANGING INTERFACE VERSION, also replace erts version below
- * with ticket syntax like "erts-@OTP-12345@", or a temporary placeholder
- * between two @ like "erts-@MyName@", if you don't know what a ticket is.
+ * WHEN CHANGING INTERFACE VERSION, also replace erts version below with
+ * a ticket number e.g. "erts-@OTP-12345@". The syntax is the same as for
+ * runtime dependencies so multiple tickets should be separated with ":", e.g.
+ * "erts-@OTP-12345:54321@".
+ *
+ * If you're not on the OTP team, you should use a placeholder like
+ * erts-@MyName@ instead.
*/
-#define ERL_NIF_MIN_ERTS_VERSION "erts-@OTP-15095 OTP-15640@ (OTP-22)"
+#define ERL_NIF_MIN_ERTS_VERSION "erts-@OTP-15095:OTP-15640@"
/*
* The emulator will refuse to load a nif-lib with a major version