Disable long long warnings when compiled with an old g++ version.

src/libsodium/crypto_sign/ed25519/ref10/ge_scalarmult_base.c

@@ -1,6 +1,12 @@
 #include "ge.h"
 #include "crypto_uint32.h"
 
+#ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
+#endif
+
 static unsigned char equal(signed char b,signed char c)
 {
   unsigned char ub = b;

src/libsodium/crypto_stream/aes128ctr/portable/int128.h

@@ -3,6 +3,12 @@
 
 #include "common.h"
 
+#ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
+#endif
+
 typedef struct{
   unsigned long long a;
   unsigned long long b;

src/libsodium/include/sodium/crypto_auth.h

@@ -7,6 +7,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_auth_hmacsha256.h

@@ -8,6 +8,9 @@
 #define crypto_auth_hmacsha256_KEYBYTES 32U
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_auth_hmacsha512256.h

@@ -8,6 +8,9 @@
 #define crypto_auth_hmacsha512256_KEYBYTES 32U
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_box.h

@@ -14,6 +14,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h

@@ -13,6 +13,9 @@
 #define crypto_box_curve25519xsalsa20poly1305_MACBYTES (crypto_box_curve25519xsalsa20poly1305_ZEROBYTES - crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES)
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_generichash.h

@@ -7,6 +7,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_generichash_blake2b.h

@@ -24,6 +24,9 @@
 #endif
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_hash.h

@@ -9,6 +9,9 @@
 #define crypto_hash_PRIMITIVE "sha512"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_hash_sha256.h

@@ -8,6 +8,9 @@
 #define crypto_hash_sha256_BLOCKBYTES 64U
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_hash_sha512.h

@@ -8,6 +8,9 @@
 #define crypto_hash_sha512_BLOCKBYTES 128U
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_hashblocks_sha256.h

@@ -8,6 +8,9 @@
 #define crypto_hashblocks_sha256_BLOCKBYTES 64U
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_hashblocks_sha512.h

@@ -8,6 +8,9 @@
 #define crypto_hashblocks_sha512_BLOCKBYTES 128U
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_onetimeauth.h

@@ -7,6 +7,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h

@@ -7,6 +7,9 @@
 #define crypto_onetimeauth_poly1305_BYTES 16U
 #define crypto_onetimeauth_poly1305_KEYBYTES 32U
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_onetimeauth_poly1305_53.h

@@ -5,6 +5,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_onetimeauth_poly1305_donna.h

@@ -5,6 +5,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_secretbox.h

@@ -7,6 +7,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h

@@ -11,6 +11,9 @@
 #define crypto_secretbox_xsalsa20poly1305_MACBYTES (crypto_secretbox_xsalsa20poly1305_ZEROBYTES - crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES)
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_shorthash.h

@@ -7,6 +7,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_shorthash_siphash24.h

@@ -8,6 +8,9 @@
 #define crypto_shorthash_siphash24_KEYBYTES 16U
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_sign.h

@@ -14,6 +14,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_sign_ed25519.h

@@ -10,6 +10,9 @@
 #define crypto_sign_ed25519_BYTES 64U
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h

@@ -9,6 +9,9 @@
 #define crypto_sign_edwards25519sha512batch_BYTES 64U
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_stream.h

@@ -15,6 +15,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_stream_aes128ctr.h

@@ -17,6 +17,9 @@
 #define crypto_stream_aes128ctr_BEFORENMBYTES 1408U
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_stream_aes256estream.h

@@ -18,6 +18,9 @@
 #define crypto_stream_aes256estream_BEFORENMBYTES 276U
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_stream_salsa20.h

@@ -13,6 +13,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_stream_salsa2012.h

@@ -13,6 +13,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_stream_salsa208.h

@@ -13,6 +13,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/crypto_stream_xsalsa20.h

@@ -16,6 +16,9 @@
 #define crypto_stream_xsalsa20_NONCEBYTES 24U
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

src/libsodium/include/sodium/randombytes.h

@@ -10,6 +10,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif