diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-15 09:30:46 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-15 09:30:46 +0000 |
commit | 2244f0a5a874fd21da847fca2afc26dc16de7ccc (patch) | |
tree | cfdf45cc5eca43593ecd0e65eb1d2f4caf033f92 /url/url_file.h | |
parent | 0b7b7c213dec8e26c4c061f316e938923b1a7f02 (diff) | |
download | chromium_src-2244f0a5a874fd21da847fca2afc26dc16de7ccc.zip chromium_src-2244f0a5a874fd21da847fca2afc26dc16de7ccc.tar.gz chromium_src-2244f0a5a874fd21da847fca2afc26dc16de7ccc.tar.bz2 |
Revert 193777 "url: Changes to make it build standalone."
url/url_canon_stdstring.h:65: error: undefined reference to 'vtable for url_canon::StdStringCanonOutput'
> url: Changes to make it build standalone.
>
> - Update the gyp file.
> - Rename the gyp file from googleurl.gyp to url.gyp, so it matches the directory
> name.
> - Update the header include paths.
> - Update the header include guards.
> - Rename the target name from googleurl to url and googleurl_unittests to
> url_unittests.
> - Add missing OVERRIDEs where clang complains.
>
> BUG=229660
> TEST=url_unittests
> R=brettw@chromium.org
>
> Review URL: https://codereview.chromium.org/14016005
TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/14264002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url/url_file.h')
-rw-r--r-- | url/url_file.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/url/url_file.h b/url/url_file.h index e91a73c..c1b8ac9 100644 --- a/url/url_file.h +++ b/url/url_file.h @@ -30,10 +30,10 @@ // Provides shared functions used by the internals of the parser and // canonicalizer for file URLs. Do not use outside of these modules. -#ifndef URL_URL_FILE_H_ -#define URL_URL_FILE_H_ +#ifndef GOOGLEURL_SRC_URL_FILE_H__ +#define GOOGLEURL_SRC_URL_FILE_H__ -#include "url/url_parse_internal.h" +#include "googleurl/src/url_parse_internal.h" namespace url_parse { @@ -105,4 +105,4 @@ inline bool DoesBeginUNCPath(const CHAR* text, } // namespace url_parse -#endif // URL_URL_FILE_H_ +#endif // GOOGLEURL_SRC_URL_FILE_H__ |