summaryrefslogtreecommitdiffstats
path: root/url/url_common.h
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-15 09:30:46 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-15 09:30:46 +0000
commit2244f0a5a874fd21da847fca2afc26dc16de7ccc (patch)
treecfdf45cc5eca43593ecd0e65eb1d2f4caf033f92 /url/url_common.h
parent0b7b7c213dec8e26c4c061f316e938923b1a7f02 (diff)
downloadchromium_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_common.h')
-rw-r--r--url/url_common.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/url/url_common.h b/url/url_common.h
index 5e67a0f..ac045a8 100644
--- a/url/url_common.h
+++ b/url/url_common.h
@@ -27,8 +27,8 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#ifndef URL_URL_COMMON_H_
-#define URL_URL_COMMON_H_
+#ifndef GOOGLEURL_SRC_URL_COMMON_H__
+#define GOOGLEURL_SRC_URL_COMMON_H__
#if !defined(GURL_IMPLEMENTATION)
#define GURL_IMPLEMENTATION 0
@@ -50,4 +50,5 @@
#define GURL_API
#endif
-#endif // URL_URL_COMMON_H_
+#endif // GOOGLEURL_SRC_URL_COMMON_H__
+