diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-18 21:19:45 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-18 21:19:45 +0000 |
| commit | 318076b4adca3868e0f2438953e69f2ce2d6336f (patch) | |
| tree | 98d4c5d4a5442c86c526cca6538a099de4f04360 /url/url_canon_stdstring.h | |
| parent | 3c9185a2ddfbe06f42d0aca50d1a6e33b3ed3a8b (diff) | |
| download | chromium_src-318076b4adca3868e0f2438953e69f2ce2d6336f.zip chromium_src-318076b4adca3868e0f2438953e69f2ce2d6336f.tar.gz chromium_src-318076b4adca3868e0f2438953e69f2ce2d6336f.tar.bz2 | |
url: Build it as a static library.
This is temporary just to avoid weird link issues in Windows XP.
- 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.
- Remove GURL_API (this will be replaced by URL_EXPORT when we componentize it again).
- Remove url_common.h (will be replaced by url_export.h when we componentize it again).
BUG=229660
TEST=url_unittests
R=brettw@chromium.org
Review URL: https://codereview.chromium.org/13998025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url/url_canon_stdstring.h')
| -rw-r--r-- | url/url_canon_stdstring.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/url/url_canon_stdstring.h b/url/url_canon_stdstring.h index 21272e0..3829ac2 100644 --- a/url/url_canon_stdstring.h +++ b/url/url_canon_stdstring.h @@ -27,15 +27,16 @@ // (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_CANON_STDSTRING_H_ +#define URL_URL_CANON_STDSTRING_H_ + // This header file defines a canonicalizer output method class for STL // strings. Because the canonicalizer tries not to be dependent on the STL, // we have segregated it here. -#ifndef GOOGLEURL_SRC_URL_CANON_STDSTRING_H__ -#define GOOGLEURL_SRC_URL_CANON_STDSTRING_H__ - #include <string> -#include "googleurl/src/url_canon.h" + +#include "url/url_canon.h" namespace url_canon { @@ -130,5 +131,4 @@ class StdStringReplacements : } // namespace url_canon -#endif // GOOGLEURL_SRC_URL_CANON_STDSTRING_H__ - +#endif // URL_URL_CANON_STDSTRING_H_ |