Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Unified Diff: third_party/snappy/win32/snappy-stubs-public.h

Issue 2712273002: DEPS: Upgrade snappy to 1.1.4. (Closed)
Patch Set: Buildbot fix, take 2. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/snappy/win32/config.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/snappy/win32/snappy-stubs-public.h
diff --git a/third_party/snappy/win32/snappy-stubs-public.h b/third_party/snappy/win32/snappy-stubs-public.h
index 99e498c0a845a082f5c3dcd5d81ff49c035d73ea..1ea7baf78851cc9f09653a8b683e0a1df1c545d6 100644
--- a/third_party/snappy/win32/snappy-stubs-public.h
+++ b/third_party/snappy/win32/snappy-stubs-public.h
@@ -33,10 +33,10 @@
// which is a public header. Instead, snappy-stubs-public.h is generated by
// from snappy-stubs-public.h.in at configure time.
-#ifndef UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
-#define UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
+#ifndef THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
+#define THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
-#if 0
+#if 1
#include <stdint.h>
#endif
@@ -50,7 +50,7 @@
#define SNAPPY_MAJOR 1
#define SNAPPY_MINOR 1
-#define SNAPPY_PATCHLEVEL 0
+#define SNAPPY_PATCHLEVEL 4
#define SNAPPY_VERSION \
((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL)
@@ -58,7 +58,7 @@
namespace snappy {
-#if 0
+#if 1
typedef int8_t int8;
typedef uint8_t uint8;
typedef int16_t int16;
@@ -86,7 +86,7 @@ typedef std::string string;
void operator=(const TypeName&)
#endif
-#if 1
+#if !0
// Windows does not have an iovec type, yet the concept is universally useful.
// It is simple to define it ourselves, so we put it inside our own namespace.
struct iovec {
@@ -95,12 +95,6 @@ struct iovec {
};
#endif
-// MSVC does not have ssize_t by default; autoconf suggests defining as `int'.
-// Would be in config.h, but Chromium does not use automake/autoconf.
-#include <Windows.h>
-#include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
-
} // namespace snappy
-#endif // UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
+#endif // THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
« no previous file with comments | « third_party/snappy/win32/config.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698