1diff -ruN /usr/local/google/home/rpius/Downloads/xmlrpc++0.7/Android.mk /usr/local/google/home/rpius/Work/android/internal/mnc-brillo-dev/external/xmlrpc++0.7/Android.mk
2--- /usr/local/google/home/rpius/Downloads/xmlrpc++0.7/Android.mk	1969-12-31 16:00:00.000000000 -0800
3+++ /usr/local/google/home/rpius/Work/android/internal/mnc-brillo-dev/external/xmlrpc++0.7/Android.mk	2015-09-23 10:50:40.634298728 -0700
4@@ -0,0 +1,20 @@
5+LOCAL_PATH:= $(call my-dir)
6+ifeq ($(HOST_OS),linux)
7+
8+include $(CLEAR_VARS)
9+LOCAL_MODULE:= libxmlrpc++
10+
11+LOCAL_CPP_FEATURES := exceptions
12+LOCAL_CPPFLAGS := -Wall -fexceptions
13+LOCAL_C_INCLUDES:= $(LOCAL_PATH)/src
14+
15+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src
16+
17+xmlrpc_src_files := \
18+	$(wildcard $(LOCAL_PATH)/src/*.cpp)
19+LOCAL_SRC_FILES := \
20+	$(xmlrpc_src_files:$(LOCAL_PATH)/%=%)
21+
22+include $(BUILD_SHARED_LIBRARY)
23+
24+endif # HOST_OS == linux
25diff -ruN /usr/local/google/home/rpius/Downloads/xmlrpc++0.7/src/base64.h /usr/local/google/home/rpius/Work/android/internal/mnc-brillo-dev/external/xmlrpc++0.7/src/base64.h
26--- /usr/local/google/home/rpius/Downloads/xmlrpc++0.7/src/base64.h	2003-03-06 09:25:37.000000000 -0800
27+++ /usr/local/google/home/rpius/Work/android/internal/mnc-brillo-dev/external/xmlrpc++0.7/src/base64.h	2015-09-23 10:47:07.524143202 -0700
28@@ -10,6 +10,7 @@
29 #define __BASE64_H_INCLUDED__ 1
30
31 #ifndef MAKEDEPEND
32+# include <iostream>
33 # include <iterator>
34 #endif
35
36diff -ruN /usr/local/google/home/rpius/Downloads/xmlrpc++0.7/src/XmlRpcClient.cpp /usr/local/google/home/rpius/Work/android/internal/mnc-brillo-dev/external/xmlrpc++0.7/src/XmlRpcClient.cpp
37--- /usr/local/google/home/rpius/Downloads/xmlrpc++0.7/src/XmlRpcClient.cpp	2003-03-06 09:25:37.000000000 -0800
38+++ /usr/local/google/home/rpius/Work/android/internal/mnc-brillo-dev/external/xmlrpc++0.7/src/XmlRpcClient.cpp	2015-09-23 10:52:47.679583068 -0700
39@@ -394,7 +394,7 @@
40   // Expect either <params><param>... or <fault>...
41   if ((XmlRpcUtil::nextTagIs(PARAMS_TAG,_response,&offset) &&
42        XmlRpcUtil::nextTagIs(PARAM_TAG,_response,&offset)) ||
43-      XmlRpcUtil::nextTagIs(FAULT_TAG,_response,&offset) && (_isFault = true))
44+      (XmlRpcUtil::nextTagIs(FAULT_TAG,_response,&offset) && (_isFault = true)))
45   {
46     if ( ! result.fromXml(_response, &offset)) {
47       XmlRpcUtil::error("Error in XmlRpcClient::parseResponse: Invalid response value. Response:\n%s", _response.c_str());
48diff -ruN /usr/local/google/home/rpius/Downloads/xmlrpc++0.7/src/XmlRpcDispatch.cpp /usr/local/google/home/rpius/Work/android/internal/mnc-brillo-dev/external/xmlrpc++0.7/src/XmlRpcDispatch.cpp
49--- /usr/local/google/home/rpius/Downloads/xmlrpc++0.7/src/XmlRpcDispatch.cpp	2003-03-06 09:25:37.000000000 -0800
50+++ /usr/local/google/home/rpius/Work/android/internal/mnc-brillo-dev/external/xmlrpc++0.7/src/XmlRpcDispatch.cpp	2015-09-23 10:39:23.463444193 -0700
51@@ -4,7 +4,6 @@
52 #include "XmlRpcUtil.h"
53
54 #include <math.h>
55-#include <sys/timeb.h>
56
57 #if defined(_WINDOWS)
58 # include <winsock2.h>
59diff -ruN /usr/local/google/home/rpius/Downloads/xmlrpc++0.7/src/XmlRpc.h /usr/local/google/home/rpius/Work/android/internal/mnc-brillo-dev/external/xmlrpc++0.7/src/XmlRpc.h
60--- /usr/local/google/home/rpius/Downloads/xmlrpc++0.7/src/XmlRpc.h	2003-03-06 09:25:37.000000000 -0800
61+++ /usr/local/google/home/rpius/Work/android/internal/mnc-brillo-dev/external/xmlrpc++0.7/src/XmlRpc.h	2015-09-23 10:48:22.088897560 -0700
62@@ -49,6 +49,7 @@
63     //! Report an error. Custom error handlers should define this method.
64     virtual void error(const char* msg) = 0;
65
66+    virtual ~XmlRpcErrorHandler() {}
67   protected:
68     static XmlRpcErrorHandler* _errorHandler;
69   };
70@@ -75,6 +76,7 @@
71     //! Output a message. Custom error handlers should define this method.
72     virtual void log(int level, const char* msg) = 0;
73
74+    virtual ~XmlRpcLogHandler() {}
75   protected:
76     static XmlRpcLogHandler* _logHandler;
77     static int _verbosity;
78diff -ruN /usr/local/google/home/rpius/Downloads/xmlrpc++0.7/src/XmlRpcUtil.cpp /usr/local/google/home/rpius/Work/android/internal/mnc-brillo-dev/external/xmlrpc++0.7/src/XmlRpcUtil.cpp
79--- /usr/local/google/home/rpius/Downloads/xmlrpc++0.7/src/XmlRpcUtil.cpp	2003-03-06 09:25:37.000000000 -0800
80+++ /usr/local/google/home/rpius/Work/android/internal/mnc-brillo-dev/external/xmlrpc++0.7/src/XmlRpcUtil.cpp	2015-09-23 10:40:13.263948827 -0700
81@@ -38,6 +38,7 @@
82 #endif
83   }
84
85+  ~DefaultLogHandler() {}
86 } defaultLogHandler;
87
88 // Message log singleton
89@@ -55,6 +56,8 @@
90     std::cerr << msg << std::endl;
91 #endif
92   }
93+
94+  ~DefaultErrorHandler() {}
95 } defaultErrorHandler;
96
97
98