diff options
| author | Siri Hansen <[email protected]> | 2018-01-09 12:13:40 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2018-01-09 12:13:40 +0100 |
| commit | 276117e6322bb7cc299c9e22beec0016a32f7806 (patch) | |
| tree | 84a2b98a5abfc66c88a6769ab0bcae18fdf7b869 /lib | |
| parent | 34a9e40405cef0c4b4606df63f31716214b8b44d (diff) | |
| parent | c35ea0683bf7474ac5ff5e1ac3c1ed44f35523b4 (diff) | |
| download | otp-276117e6322bb7cc299c9e22beec0016a32f7806.tar.gz otp-276117e6322bb7cc299c9e22beec0016a32f7806.tar.bz2 otp-276117e6322bb7cc299c9e22beec0016a32f7806.zip | |
Merge branch 'siri/etop/include/ERL-534/OTP-14842' into maint
* siri/etop/include/ERL-534/OTP-14842:
[observer] Use include_lib instead of include with relative path
Add runtime_tools/include to tertiary bootstrap
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/observer/include/etop.hrl | 2 | ||||
| -rw-r--r-- | lib/observer/src/observer_pro_wx.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/observer/include/etop.hrl b/lib/observer/include/etop.hrl index 002937e522..f8d370450b 100644 --- a/lib/observer/include/etop.hrl +++ b/lib/observer/include/etop.hrl @@ -18,4 +18,4 @@ %% %CopyrightEnd% %% --include("../../runtime_tools/include/observer_backend.hrl"). +-include_lib("runtime_tools/include/observer_backend.hrl"). diff --git a/lib/observer/src/observer_pro_wx.erl b/lib/observer/src/observer_pro_wx.erl index 2e5fe0bc1a..d612e0a1c5 100644 --- a/lib/observer/src/observer_pro_wx.erl +++ b/lib/observer/src/observer_pro_wx.erl @@ -27,7 +27,7 @@ handle_event/2, handle_cast/2]). -include_lib("wx/include/wx.hrl"). --include("../include/etop.hrl"). +-include("etop.hrl"). -include("observer_defs.hrl"). -include("etop_defs.hrl"). |