srtp/crypto/include/integers.h - Issue 936663005: Land https://codereview.chromium.org/889083003/ to update libsrtp to upstream 1.5.0

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 936663005: Land https://codereview.chromium.org/889083003/ to update libsrtp to upstream 1.5.0 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libsrtp/

Patch Set: 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/integers.h

===================================================================

--- srtp/crypto/include/integers.h (revision 294174)

+++ srtp/crypto/include/integers.h (working copy)

@@ -47,7 +47,6 @@

#ifndef INTEGERS_H

#define INTEGERS_H

-#include "config.h" /* configuration file, using autoconf */

#ifdef SRTP_KERNEL

@@ -76,7 +75,7 @@

#endif

/* Can we do 64 bit integers? */

-#ifndef HAVE_UINT64_T

+#if !defined(HAVE_UINT64_T)

# if SIZEOF_UNSIGNED_LONG == 8

typedef unsigned long uint64_t;

# elif SIZEOF_UNSIGNED_LONG_LONG == 8

@@ -99,7 +98,7 @@

#endif

-#ifdef NO_64BIT_MATH

+#if defined(NO_64BIT_MATH) && defined(HAVE_CONFIG_H)

typedef double uint64_t;

/* assert that sizeof(double) == 8 */

extern uint64_t make64(uint32_t high, uint32_t low);

« no previous file with comments | « srtp/crypto/include/hmac.h ('k') | srtp/crypto/include/kernel_compat.h » ('j') | no next file with comments »