summaryrefslogtreecommitdiff
path: root/googleurl
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2012-08-04 17:50:20 +0200
committerAndreas Baumann <abaumann@yahoo.com>2012-08-04 17:50:20 +0200
commit79abc6b0891223fa1c9c0f57769cd58e562f22f1 (patch)
tree5576aecfafaa1e5a8c92529916bd3cb0ab98c62d /googleurl
parent39d78b3dd658db518740c561f0b4e80a43987a38 (diff)
downloadcrawler-79abc6b0891223fa1c9c0f57769cd58e562f22f1.tar.gz
crawler-79abc6b0891223fa1c9c0f57769cd58e562f22f1.tar.bz2
first working google url test1
Diffstat (limited to 'googleurl')
-rw-r--r--googleurl/GNUmakefile4
-rw-r--r--googleurl/base/logging.cpp (renamed from googleurl/base/logging.cc)0
-rw-r--r--googleurl/base/string16.cpp (renamed from googleurl/base/string16.cc)4
3 files changed, 6 insertions, 2 deletions
diff --git a/googleurl/GNUmakefile b/googleurl/GNUmakefile
index 0971a4a..b73d9da 100644
--- a/googleurl/GNUmakefile
+++ b/googleurl/GNUmakefile
@@ -4,7 +4,8 @@ SUBDIRS =
-include $(TOPDIR)/makefiles/gmake/platform.mk
-INCLUDE_CFLAGS = \
+INCLUDE_CXXFLAGS = \
+ -DNDEBUG
INCLUDE_LDFLAGS = \
@@ -14,6 +15,7 @@ INCLUDE_DIRS = \
INCLUDE_LIBS = \
CPP_OBJS = \
+ base/string16.o \
url_canon_etc.o \
url_canon_filesystemurl.o \
url_canon_fileurl.o \
diff --git a/googleurl/base/logging.cc b/googleurl/base/logging.cpp
index ab03150..ab03150 100644
--- a/googleurl/base/logging.cc
+++ b/googleurl/base/logging.cpp
diff --git a/googleurl/base/string16.cc b/googleurl/base/string16.cpp
index fc25809..844d79d 100644
--- a/googleurl/base/string16.cc
+++ b/googleurl/base/string16.cpp
@@ -28,6 +28,8 @@
#include "base/string16.h"
+#include <string.h>
+
#ifdef WIN32
#error This file should not be used on 2-byte wchar_t systems
@@ -89,6 +91,6 @@ char16* c16memset(char16* s, char16 c, size_t n) {
} // namespace base
-template class std::basic_string<char16, base::string16_char_traits>;
+//template class std::basic_string<char16, base::string16_char_traits>;
#endif // WIN32