Update libsrtp to version 2.0

crypto/include/integers.h

Index: crypto/include/integers.h
diff --git a/srtp/crypto/include/integers.h b/crypto/include/integers.h
similarity index 97%
rename from srtp/crypto/include/integers.h
rename to crypto/include/integers.h
index ed77210b2b0ee108b879f9bbdb35b5621484d296..dafdb066ad262dd7d0e82caa3c209eafa34b411a 100644
--- a/srtp/crypto/include/integers.h
+++ b/crypto/include/integers.h
@@ -48,12 +48,6 @@
 #define INTEGERS_H
 
 
-#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>
@@ -74,6 +68,10 @@
 # include <machine/types.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Can we do 64 bit integers? */
 #if !defined(HAVE_UINT64_T)
 # if SIZEOF_UNSIGNED_LONG == 8
@@ -106,7 +104,6 @@ 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
    addresses.  This is required for processors that do not allow unaligned
@@ -143,4 +140,8 @@ extern uint32_t low32(uint64_t value);
 #define GET_32(addr) (*(((uint32_t *) (addr)))
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* INTEGERS_H */