diff options
author | Micael Karlberg <[email protected]> | 2013-11-26 15:13:06 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2013-11-26 15:13:06 +0100 |
commit | 8852c947d413e8814d663c9319f7b8932b05a7ad (patch) | |
tree | 130ab4aea889874be6b20e9058efb9eab79bb2eb /lib/snmp/src/app/snmp_internal.hrl | |
parent | 666884a245fd57f04e0a15b0602c46bf271966f0 (diff) | |
parent | b73c98771730a6db086d3697eaa6b6ac11be0361 (diff) | |
download | otp-8852c947d413e8814d663c9319f7b8932b05a7ad.tar.gz otp-8852c947d413e8814d663c9319f7b8932b05a7ad.tar.bz2 otp-8852c947d413e8814d663c9319f7b8932b05a7ad.zip |
Merge branch 'bmk/snmp/snmp425_integration' into maint
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
lib/snmp/src/misc/snmp_log.erl
lib/snmp/vsn.mk
Diffstat (limited to 'lib/snmp/src/app/snmp_internal.hrl')
-rw-r--r-- | lib/snmp/src/app/snmp_internal.hrl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/snmp/src/app/snmp_internal.hrl b/lib/snmp/src/app/snmp_internal.hrl index 5ff715e0b7..f04fa4dd53 100644 --- a/lib/snmp/src/app/snmp_internal.hrl +++ b/lib/snmp/src/app/snmp_internal.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2006-2009. All Rights Reserved. +%% Copyright Ericsson AB 2006-2013. 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 @@ -24,6 +24,8 @@ -define(APPLICATION, snmp). -endif. +-define(STACK(), erlang:get_stacktrace()). + -define(snmp_info(C, F, A), ?snmp_msg(info_msg, C, F, A)). -define(snmp_warning(C, F, A), ?snmp_msg(warning_msg, C, F, A)). -define(snmp_error(C, F, A), ?snmp_msg(error_msg, C, F, A)). |