diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2009-12-17 10:11:16 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2009-12-17 10:11:16 +0000 |
| commit | ae338a2aab4ac3d9a9c60d2c3e00f76ff8d3c25a (patch) | |
| tree | 3f4ed103202316c259629d74ece2fbc0c7452cb0 | |
| parent | 68f1e606f3307c7bb40d69efe154307207711ede (diff) | |
| download | otp-ae338a2aab4ac3d9a9c60d2c3e00f76ff8d3c25a.tar.gz otp-ae338a2aab4ac3d9a9c60d2c3e00f76ff8d3c25a.tar.bz2 otp-ae338a2aab4ac3d9a9c60d2c3e00f76ff8d3c25a.zip | |
Fix duplicate ei_tracelevel symbol
The symbol ei_tracelevel was not declared extern which could
crash the linking step on some compilers.
Updated .gitignore to ignore object files in erl_interface.
| -rw-r--r-- | lib/.gitignore | 7 | ||||
| -rw-r--r-- | lib/erl_interface/src/misc/ei_internal.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/.gitignore b/lib/.gitignore index bdc850f3b7..0cb938ea7c 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -1,3 +1,10 @@ +# erl_interface + +/erl_interface/bin +/erl_interface/obj.mt +/erl_interface/obj.st +/erl_interface/obj + # megaco /megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3a.erl diff --git a/lib/erl_interface/src/misc/ei_internal.h b/lib/erl_interface/src/misc/ei_internal.h index 9f51d1f61b..f7805efebf 100644 --- a/lib/erl_interface/src/misc/ei_internal.h +++ b/lib/erl_interface/src/misc/ei_internal.h @@ -149,7 +149,7 @@ {if (ei_tracelevel >= 5) ei_trace_printf(NAME,1,FORMAT,ARG1,ARG2,ARG3,ARG4, \ ARG5,ARG6,ARG7);} -int ei_tracelevel; +extern int ei_tracelevel; void ei_trace_printf(const char *name, int level, const char *format, ...); |