Land https://codereview.chromium.org/889083003/ to update libsrtp to upstream 1.5.0

srtp/crypto/include/integers.h

 /*
  * integers.h
  *
  * defines integer types (or refers to their definitions)
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 
 /*
@@ skipping 29 matching lines @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 
 #ifndef INTEGERS_H
 #define INTEGERS_H
 
-#include "config.h"     /* configuration file, using autoconf          */
 
 #ifdef SRTP_KERNEL
 
 #include "kernel_compat.h"
 
 #else /* SRTP_KERNEL */
 
 /* use standard integer definitions, if they're available  */
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_INT_TYPES_H
 # include <sys/int_types.h>    /* this exists on Sun OS */
 #endif
 #ifdef HAVE_MACHINE_TYPES_H
 # include <machine/types.h>
 #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
 typedef unsigned long long      uint64_t;
 # else
 #  define NO_64BIT_MATH 1
 # endif
 #endif
 
 /* Reasonable defaults for 32 bit machines - you may need to
  * edit these definitions for your own machine. */
 #ifndef HAVE_UINT8_T
 typedef unsigned char           uint8_t;
 #endif
 #ifndef HAVE_UINT16_T
 typedef unsigned short int      uint16_t;
 #endif
 #ifndef HAVE_UINT32_T
 typedef unsigned int            uint32_t;
 #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);
 extern uint32_t high32(uint64_t value);
 extern uint32_t low32(uint64_t value);
 #endif
 
 #endif /* SRTP_KERNEL */
 
 /* These macros are to load and store 32-bit values from un-aligned
@@ skipping 25 matching lines @@
                       (((unsigned char *) (addr))[2] << 16) |  \
                       (((unsigned char *) (addr))[1] << 8)  |  \
                       (((unsigned char *) (addr))[0])) 
 #endif // WORDS_BIGENDIAN
 #else
 #define PUT_32(addr,value) *(((uint32_t *) (addr)) = (value)
 #define GET_32(addr) (*(((uint32_t *) (addr)))
 #endif
 
 #endif /* INTEGERS_H */