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

Unified Diff: srtp/crypto/include/datatypes.h

Issue 889083003: Update libsrtp to upstream 1.5.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libsrtp@master
Patch Set: Minimal changes against upstream 1.5.0 Created 5 years, 10 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
Index: srtp/crypto/include/datatypes.h
diff --git a/srtp/crypto/include/datatypes.h b/srtp/crypto/include/datatypes.h
index 7993b5876602256e908521e5cb1b32f494ebc57f..846f3f02a4164a61d9b06231bea6c0d4b8948e50 100644
--- a/srtp/crypto/include/datatypes.h
+++ b/srtp/crypto/include/datatypes.h
@@ -70,7 +70,6 @@
#endif
-
/* if DATATYPES_USE_MACROS is defined, then little functions are macros */
#define DATATYPES_USE_MACROS
@@ -99,6 +98,12 @@ typedef union {
uint64_t v64[2];
} v128_t;
+typedef union {
+ uint8_t v8[32];
+ uint16_t v16[16];
+ uint32_t v32[8];
+ uint64_t v64[4];
+} v256_t;
/* some useful and simple math functions */
@@ -384,7 +389,7 @@ void
octet_string_set_to_zero(uint8_t *s, int len);
-#ifndef SRTP_KERNEL_LINUX
+#if !defined(SRTP_KERNEL_LINUX)
/*
* Convert big endian integers to CPU byte order.

Powered by Google App Engine
This is Rietveld 408576698