Update libsrtp to version 2.0

crypto/include/integers.h

 /*
  * integers.h
  *
  * defines integer types (or refers to their definitions)
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 
 /*
@@ skipping 30 matching lines @@
  * 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
 
 
-#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
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Can we do 64 bit integers? */
 #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
@@ skipping 12 matching lines @@
 
 
 #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
    addresses.  This is required for processors that do not allow unaligned
    loads. */
 #ifdef ALIGNMENT_32BIT_REQUIRED
 /* Note that if it's in a variable, you can memcpy it */
 #ifdef WORDS_BIGENDIAN
 #define PUT_32(addr,value) \
     { \
         ((unsigned char *) (addr))[0] = (value >> 24); \
@@ skipping 16 matching lines @@
 #define GET_32(addr) ((((unsigned char *) (addr))[3] << 24) |  \
                       (((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
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* INTEGERS_H */