[4070] | 1 | Index: gears/geolocation/backoff_manager.cc |
---|
| 2 | =================================================================== |
---|
| 3 | --- gears/geolocation/backoff_manager.cc (revision 3373) |
---|
| 4 | +++ gears/geolocation/backoff_manager.cc (working copy) |
---|
| 5 | @@ -26,6 +26,7 @@ |
---|
| 6 | #include "gears/geolocation/backoff_manager.h" |
---|
| 7 | |
---|
| 8 | #include <assert.h> |
---|
| 9 | +#include <stdlib.h> |
---|
| 10 | |
---|
| 11 | // The baseline minimum period between network requests. |
---|
| 12 | static const int kBaselineMinimumRequestInterval = 1000 * 5; // 5 seconds |
---|
| 13 | Index: gears/cctests/test.cc |
---|
| 14 | =================================================================== |
---|
| 15 | --- gears/cctests/test.cc (revision 3373) |
---|
| 16 | +++ gears/cctests/test.cc (working copy) |
---|
| 17 | @@ -700,15 +700,15 @@ |
---|
| 18 | |
---|
| 19 | bool ok = false; |
---|
| 20 | JsParamType t = context->GetArgumentType(1); |
---|
| 21 | - if (type == STRING16(L"bool") && t == JSPARAM_BOOL || |
---|
| 22 | - type == STRING16(L"int") && t == JSPARAM_INT || |
---|
| 23 | - type == STRING16(L"double") && t == JSPARAM_DOUBLE || |
---|
| 24 | - type == STRING16(L"string") && t == JSPARAM_STRING16 || |
---|
| 25 | - type == STRING16(L"null") && t == JSPARAM_NULL || |
---|
| 26 | - type == STRING16(L"undefined") && t == JSPARAM_UNDEFINED || |
---|
| 27 | - type == STRING16(L"array") && t == JSPARAM_ARRAY || |
---|
| 28 | - type == STRING16(L"function") && t == JSPARAM_FUNCTION || |
---|
| 29 | - type == STRING16(L"object") && t == JSPARAM_OBJECT) { |
---|
| 30 | + if ((type == STRING16(L"bool") && t == JSPARAM_BOOL) || |
---|
| 31 | + (type == STRING16(L"int") && t == JSPARAM_INT) || |
---|
| 32 | + (type == STRING16(L"double") && t == JSPARAM_DOUBLE) || |
---|
| 33 | + (type == STRING16(L"string") && t == JSPARAM_STRING16) || |
---|
| 34 | + (type == STRING16(L"null") && t == JSPARAM_NULL) || |
---|
| 35 | + (type == STRING16(L"undefined") && t == JSPARAM_UNDEFINED) || |
---|
| 36 | + (type == STRING16(L"array") && t == JSPARAM_ARRAY) || |
---|
| 37 | + (type == STRING16(L"function") && t == JSPARAM_FUNCTION) || |
---|
| 38 | + (type == STRING16(L"object") && t == JSPARAM_OBJECT)) { |
---|
| 39 | ok = true; |
---|
| 40 | } |
---|
| 41 | context->SetReturnValue(JSPARAM_BOOL, &ok); |
---|
| 42 | Index: gears/desktop/desktop.cc |
---|
| 43 | =================================================================== |
---|
| 44 | --- gears/desktop/desktop.cc (revision 3373) |
---|
| 45 | +++ gears/desktop/desktop.cc (working copy) |
---|
| 46 | @@ -216,14 +216,14 @@ |
---|
| 47 | } |
---|
| 48 | |
---|
| 49 | // Resolve the icon urls |
---|
| 50 | - if (!shortcut_info->icon16x16.url.empty() && |
---|
| 51 | - !ResolveUrl(&shortcut_info->icon16x16.url, &error_) || |
---|
| 52 | - !shortcut_info->icon32x32.url.empty() && |
---|
| 53 | - !ResolveUrl(&shortcut_info->icon32x32.url, &error_) || |
---|
| 54 | - !shortcut_info->icon48x48.url.empty() && |
---|
| 55 | - !ResolveUrl(&shortcut_info->icon48x48.url, &error_) || |
---|
| 56 | - !shortcut_info->icon128x128.url.empty() && |
---|
| 57 | - !ResolveUrl(&shortcut_info->icon128x128.url, &error_)) { |
---|
| 58 | + if ((!shortcut_info->icon16x16.url.empty() && |
---|
| 59 | + !ResolveUrl(&shortcut_info->icon16x16.url, &error_)) || |
---|
| 60 | + (!shortcut_info->icon32x32.url.empty() && |
---|
| 61 | + !ResolveUrl(&shortcut_info->icon32x32.url, &error_)) || |
---|
| 62 | + (!shortcut_info->icon48x48.url.empty() && |
---|
| 63 | + !ResolveUrl(&shortcut_info->icon48x48.url, &error_)) || |
---|
| 64 | + (!shortcut_info->icon128x128.url.empty() && |
---|
| 65 | + !ResolveUrl(&shortcut_info->icon128x128.url, &error_))) { |
---|
| 66 | return false; |
---|
| 67 | } |
---|
| 68 | |
---|
| 69 | Index: gears/base/common/string16.h |
---|
| 70 | =================================================================== |
---|
| 71 | --- gears/base/common/string16.h (revision 3373) |
---|
| 72 | +++ gears/base/common/string16.h (working copy) |
---|
| 73 | @@ -46,6 +46,7 @@ |
---|
| 74 | #define GEARS_BASE_COMMON_STRING16_H__ |
---|
| 75 | |
---|
| 76 | #include <string> |
---|
| 77 | +#include <string.h> |
---|
| 78 | #include "gears/base/common/basictypes.h" |
---|
| 79 | |
---|
| 80 | // Need to cast literals (Linux, OSX) and SQLite void* retvals (all platforms) |
---|
| 81 | Index: gears/base/common/string_utils.cc |
---|
| 82 | =================================================================== |
---|
| 83 | --- gears/base/common/string_utils.cc (revision 3373) |
---|
| 84 | +++ gears/base/common/string_utils.cc (working copy) |
---|
| 85 | @@ -25,6 +25,7 @@ |
---|
| 86 | |
---|
| 87 | #include "gears/base/common/string_utils.h" |
---|
| 88 | #include "third_party/convert_utf/ConvertUTF.h" |
---|
| 89 | +#include <limits.h> |
---|
| 90 | |
---|
| 91 | #if defined(OS_ANDROID) |
---|
| 92 | // Android is missing wcslen. This is just a wide character strlen. |
---|
| 93 | Index: gears/base/common/http_utils.cc |
---|
| 94 | =================================================================== |
---|
| 95 | --- gears/base/common/http_utils.cc (revision 3373) |
---|
| 96 | +++ gears/base/common/http_utils.cc (working copy) |
---|
| 97 | @@ -27,6 +27,7 @@ |
---|
| 98 | |
---|
| 99 | #include <iterator> |
---|
| 100 | #include <vector> |
---|
| 101 | +#include <stdlib.h> |
---|
| 102 | #include "gears/base/common/http_utils.h" |
---|
| 103 | |
---|
| 104 | // ---------------------------------------------------------------------- |
---|
| 105 | Index: third_party/jsoncpp/json_reader.cc |
---|
| 106 | =================================================================== |
---|
| 107 | --- third_party/jsoncpp/json_reader.cc (revision 3373) |
---|
| 108 | +++ third_party/jsoncpp/json_reader.cc (working copy) |
---|
| 109 | @@ -3,6 +3,7 @@ |
---|
| 110 | #include <utility> |
---|
| 111 | #include <stdio.h> |
---|
| 112 | #include <assert.h> |
---|
| 113 | +#include <string.h> |
---|
| 114 | |
---|
| 115 | #if _MSC_VER >= 1400 // VC++ 8.0 |
---|
| 116 | #pragma warning( disable : 4996 ) // disable warning about strdup being deprecated. |
---|
| 117 | Index: third_party/jsoncpp/json_value.cc |
---|
| 118 | =================================================================== |
---|
| 119 | --- third_party/jsoncpp/json_value.cc (revision 3373) |
---|
| 120 | +++ third_party/jsoncpp/json_value.cc (working copy) |
---|
| 121 | @@ -1,6 +1,7 @@ |
---|
| 122 | #include "third_party/jsoncpp/value.h" |
---|
| 123 | #include "third_party/jsoncpp/writer.h" |
---|
| 124 | #include <utility> |
---|
| 125 | +#include <string.h> |
---|
| 126 | #include "assert.h" |
---|
| 127 | #ifdef JSON_USE_CPPTL |
---|
| 128 | # include <cpptl/conststring.h> |
---|
| 129 | Index: third_party/jsoncpp/json_writer.cc |
---|
| 130 | =================================================================== |
---|
| 131 | --- third_party/jsoncpp/json_writer.cc (revision 3373) |
---|
| 132 | +++ third_party/jsoncpp/json_writer.cc (working copy) |
---|
| 133 | @@ -2,6 +2,7 @@ |
---|
| 134 | #include <utility> |
---|
| 135 | #include <assert.h> |
---|
| 136 | #include <stdio.h> |
---|
| 137 | +#include <string.h> |
---|
| 138 | |
---|
| 139 | #if _MSC_VER >= 1400 // VC++ 8.0 |
---|
| 140 | #pragma warning( disable : 4996 ) // disable warning about strdup being deprecated. |
---|
| 141 | Index: third_party/skia/src/core/SkDebug_stdio.cpp |
---|
| 142 | =================================================================== |
---|
| 143 | --- third_party/skia/src/core/SkDebug_stdio.cpp (revision 3373) |
---|
| 144 | +++ third_party/skia/src/core/SkDebug_stdio.cpp (working copy) |
---|
| 145 | @@ -49,12 +49,13 @@ |
---|
| 146 | |
---|
| 147 | void SkDebugf(const char format[], ...) |
---|
| 148 | { |
---|
| 149 | - char buffer[kBufferSize + 1]; |
---|
| 150 | +// char buffer[kBufferSize + 1]; |
---|
| 151 | va_list args; |
---|
| 152 | va_start(args, format); |
---|
| 153 | - vsnprintf(buffer, kBufferSize, format, args); |
---|
| 154 | +// vsnprintf(buffer, kBufferSize, format, args); |
---|
| 155 | + vfprintf(stderr, format, args); |
---|
| 156 | va_end(args); |
---|
| 157 | - fprintf(stderr, buffer); |
---|
| 158 | +// fprintf(stderr, buffer); |
---|
| 159 | } |
---|
| 160 | |
---|
| 161 | #endif |
---|
| 162 | Index: third_party/googleurl/src/url_parse.cc |
---|
| 163 | =================================================================== |
---|
| 164 | --- third_party/googleurl/src/url_parse.cc (revision 3373) |
---|
| 165 | +++ third_party/googleurl/src/url_parse.cc (working copy) |
---|
| 166 | @@ -38,7 +38,9 @@ |
---|
| 167 | |
---|
| 168 | #include "base/logging.h" |
---|
| 169 | #include "googleurl/src/url_parse_internal.h" |
---|
| 170 | +#include <cstdlib> |
---|
| 171 | |
---|
| 172 | + |
---|
| 173 | namespace url_parse { |
---|
| 174 | |
---|
| 175 | namespace { |
---|