From d63af18eaf4cad9a5d32199b17aed01df64eb663 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <abaumann@yahoo.com>
Date: Fri, 10 Aug 2012 21:51:51 +0200
Subject: started adapting googleurl on windows, icu intergration pending

---
 googleurl/Makefile.W32         | 52 ++++++++++++++++++++++++++++++++++++++++++
 googleurl/base/string16.h      |  0
 googleurl/url_canon_icu.cpp    |  0
 googleurl/url_canon_internal.h |  0
 googleurl/url_canon_ip.cpp     |  5 +++-
 5 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100755 googleurl/Makefile.W32
 mode change 100644 => 100755 googleurl/base/string16.h
 mode change 100644 => 100755 googleurl/url_canon_icu.cpp
 mode change 100644 => 100755 googleurl/url_canon_internal.h
 mode change 100644 => 100755 googleurl/url_canon_ip.cpp

(limited to 'googleurl')

diff --git a/googleurl/Makefile.W32 b/googleurl/Makefile.W32
new file mode 100755
index 0000000..b2af6be
--- /dev/null
+++ b/googleurl/Makefile.W32
@@ -0,0 +1,52 @@
+TOPDIR = ..
+
+SUBDIRS =
+
+!INCLUDE $(TOPDIR)\makefiles\nmake\platform.mk
+
+INCLUDE_CXXFLAGS = \
+	/D_WIN32_WINNT=0x504 \
+	/DNDEBUG /DWIN32
+
+INCLUDE_DIRS = \
+	/I.
+
+INCLUDE_LDFLAGS = \
+
+INCLUDE_LIBS = \
+
+CPP_OBJS = \
+	url_canon_etc.obj \
+	url_canon_filesystemurl.obj \
+	url_canon_fileurl.obj \
+	url_canon_host.obj \
+	url_canon_icu.obj \
+	url_canon_internal.obj \
+	url_canon_ip.obj \
+	url_canon_mailtourl.obj \
+	url_canon_path.obj \
+	url_canon_pathurl.obj \
+	url_canon_query.obj \
+	url_canon_relative.obj \
+	url_canon_stdurl.obj \
+	url_parse.obj \
+	url_parse_file.obj \
+	url_util.obj
+
+STATIC_LIB = \
+	googleurl.lib
+
+all: $(CPP_OBJS) $(STATIC_LIB)
+
+!INCLUDE $(TOPDIR)\makefiles\nmake\sub.mk
+
+$(STATIC_LIB): $(CPP_OBJS)
+	$(LINK) /lib /nologo /out:$@ $(STATIC_LDFLAGS) $?
+
+local_all:
+
+local_clean:
+
+local_distclean:
+
+local_test:
diff --git a/googleurl/base/string16.h b/googleurl/base/string16.h
old mode 100644
new mode 100755
diff --git a/googleurl/url_canon_icu.cpp b/googleurl/url_canon_icu.cpp
old mode 100644
new mode 100755
diff --git a/googleurl/url_canon_internal.h b/googleurl/url_canon_internal.h
old mode 100644
new mode 100755
diff --git a/googleurl/url_canon_ip.cpp b/googleurl/url_canon_ip.cpp
old mode 100644
new mode 100755
index a149242..9acf77c
--- a/googleurl/url_canon_ip.cpp
+++ b/googleurl/url_canon_ip.cpp
@@ -37,6 +37,9 @@
 
 #ifndef _WIN32
 #include <inttypes.h>
+#else
+#define WIN32_MEAN_AND_LEAN
+#include <windows.h>
 #endif
 
 namespace url_canon {
@@ -179,7 +182,7 @@ CanonHostInfo::Family IPv4ComponentToNumber(
   // Use the 64-bit strtoi so we get a big number (no hex, decimal, or octal
   // number can overflow a 64-bit number in <= 16 characters).
 #ifdef WIN32
-  uint64 num = _strtoui64(buf, NULL, BaseForType(base));
+  UINT64 num = _strtoui64(buf, NULL, BaseForType(base));
 #else 
   uint64_t num = strtoull(buf, NULL, BaseForType(base));
 #endif
-- 
cgit v1.2.3-54-g00ecf