diff options
| author | Rickard Green <[email protected]> | 2014-06-16 15:21:15 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-16 15:21:15 +0200 |
| commit | 51bf9a291c1a3ed59a28879d422485d794ea5b7c (patch) | |
| tree | 1b5c08b997dd0f5fd4c1cdd6acd75ea910d14bb6 | |
| parent | d82e6d9495db0b2583b4e65133dca0840c9842a7 (diff) | |
| parent | 42319ef8bf50bd6e607d6154a4ab1c041bb08551 (diff) | |
| download | otp-51bf9a291c1a3ed59a28879d422485d794ea5b7c.tar.gz otp-51bf9a291c1a3ed59a28879d422485d794ea5b7c.tar.bz2 otp-51bf9a291c1a3ed59a28879d422485d794ea5b7c.zip | |
Merge branch 'maint'
* maint:
Fix redefinition of ETHR_FORCE_INLINE
Fix typo in error message in reltool_server
| -rw-r--r-- | erts/include/internal/ethread.h | 1 | ||||
| -rw-r--r-- | lib/reltool/src/reltool_server.erl | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h index 70e9c937e9..31d19902f5 100644 --- a/erts/include/internal/ethread.h +++ b/erts/include/internal/ethread.h @@ -80,6 +80,7 @@ || (defined(__GNUC__) && defined(ERTS_MIXED_CYGWIN_VC)) # undef ETHR_INLINE # define ETHR_INLINE +# undef ETHR_FORCE_INLINE # define ETHR_FORCE_INLINE # undef ETHR_TRY_INLINE_FUNCS #endif diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl index 98eeed5c27..e7af4bd3f7 100644 --- a/lib/reltool/src/reltool_server.erl +++ b/lib/reltool/src/reltool_server.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2013. All Rights Reserved. +%% Copyright Ericsson AB 2009-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -2030,7 +2030,7 @@ ensure_app_info(#app{name = Name, [BadVsn | _] -> reltool_utils:throw_error( "~w: Application version clash. " - "Multiple directories contains version ~tp.", + "Multiple directories contain version ~tp.", [Name,BadVsn]) end, FirstInfo = hd(AllInfo), |