diff options
| author | Henrik Nord <[email protected]> | 2011-08-16 15:01:22 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-08-16 15:01:32 +0200 |
| commit | 48d0c4adbe85450f1224311f9b8495affaae9c6a (patch) | |
| tree | b7ca1cb97b452768898094eb44ddc6b0286af214 /lib/edoc/src/edoc_lib.erl | |
| parent | f74168772f6eb7765d8cfe0ffcce58273f920bcf (diff) | |
| parent | 52e430eb1570c0cda49a8070063f1a6a2328578b (diff) | |
| download | otp-48d0c4adbe85450f1224311f9b8495affaae9c6a.tar.gz otp-48d0c4adbe85450f1224311f9b8495affaae9c6a.tar.bz2 otp-48d0c4adbe85450f1224311f9b8495affaae9c6a.zip | |
Merge branch 'rc/edoc-minor' into dev
* rc/edoc-minor:
forgot to ensure that xmerl is found in path for include_lib to work
fix -spec declaration that doesn't work in R13B04
eliminate warnings about unused imports
removed CVS-keywords from source files
synchronized with edoc development version
OTP-9463
Diffstat (limited to 'lib/edoc/src/edoc_lib.erl')
| -rw-r--r-- | lib/edoc/src/edoc_lib.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl index 585e30a2d2..6c698e83ef 100644 --- a/lib/edoc/src/edoc_lib.erl +++ b/lib/edoc/src/edoc_lib.erl @@ -14,8 +14,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id$ -%% %% @copyright 2001-2003 Richard Carlsson %% @author Richard Carlsson <[email protected]> %% @see edoc @@ -40,7 +38,7 @@ -import(edoc_report, [report/2, warning/2]). -include("edoc.hrl"). --include("xmerl.hrl"). +-include_lib("xmerl/include/xmerl.hrl"). -define(FILE_BASE, "/"). @@ -494,7 +492,7 @@ uri_get_file(File0) -> uri_get_http(URI) -> %% Try using option full_result=false case catch {ok, httpc:request(get, {URI,[]}, [], - [{full_result, false}])} of + [{full_result, false}])} of {'EXIT', _} -> uri_get_http_r10(URI); Result -> |