workaround for C89 not supporting inline

diff --git a/src/isaac64.c b/src/isaac64.c
index 6a0037228834527098ac0f99d2922e3abc2da6e5..6928ff72b8cb7142a06513495d4e1f7157d7060c 100644 (file)
--- a/src/isaac64.c
+++ b/src/isaac64.c
@@ -7,14 +7,26 @@
 
 #define ISAAC64_MASK ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
 
+#if (defined(__STDC__) && __STDC_VERSION__ >= 199901L)
+#define HAS_INLINE
+#endif
+
 /* Extract ISAAC64_SZ_LOG bits (starting at bit 3). */
+#ifdef HAS_INLINE
 static inline uint32_t lower_bits(uint64_t x)
+#else
+static uint32_t lower_bits(uint64_t x)
+#endif
 {
        return (x & ((ISAAC64_SZ-1) << 3)) >>3;
 }
 
 /* Extract next ISAAC64_SZ_LOG bits (starting at bit ISAAC64_SZ_LOG+2). */
+#ifdef HAS_INLINE
 static inline uint32_t upper_bits(uint64_t y)
+#else
+static uint32_t upper_bits(uint64_t y)
+#endif
 {
        return (y >> (ISAAC64_SZ_LOG+3)) & (ISAAC64_SZ-1);
 }

diff --git a/sys/unix/hints/macosx10.10 b/sys/unix/hints/macosx10.10
index 85d4b63fae9a4e9b63e721b31d065bef39c37a38..e53a80d77d17fee9ccd740f1678e2e2d9ee943a4 100644 (file)
--- a/sys/unix/hints/macosx10.10
+++ b/sys/unix/hints/macosx10.10
@@ -69,7 +69,7 @@ CC=gcc
 #
 
 #CFLAGS+=-W -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -DGCC_WARN
-CFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -DGCC_WARN -ansi -pedantic
+CFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -DGCC_WARN -ansi -pedantic -Wno-long-long
 # As of LLVM build 2336.1.00, this gives dozens of spurious messages, so
 # leave it out by default.
 #CFLAGS+=-Wunreachable-code

diff --git a/sys/unix/hints/macosx10.14 b/sys/unix/hints/macosx10.14
index 2255ddb9eeed14a16343640d7e198e418a3ee2ae..c5e5a0cf13bcc7e39845f1ed000722b438b256ab 100644 (file)
--- a/sys/unix/hints/macosx10.14
+++ b/sys/unix/hints/macosx10.14
@@ -69,7 +69,7 @@ CC=gcc
 #
 
 #CFLAGS+=-W -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -DGCC_WARN
-CFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -DGCC_WARN -ansi -pedantic
+CFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -DGCC_WARN -ansi -pedantic -Wno-long-long
 # As of LLVM build 2336.1.00, this gives dozens of spurious messages, so
 # leave it out by default.
 #CFLAGS+=-Wunreachable-code

diff --git a/sys/unix/hints/macosx10.5 b/sys/unix/hints/macosx10.5
index 668b6b2b5a072a34df0532f121f5cf014caa29cd..f6d9e548319042b1e5c42da1248ca1b1f9389bf2 100644 (file)
--- a/sys/unix/hints/macosx10.5
+++ b/sys/unix/hints/macosx10.5
@@ -53,7 +53,7 @@ GAMEGRP  = games
 #WANT_SOURCE_INSTALL=1
 
 #CC=gcc -W -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -DGCC_WARN
-CC=gcc -Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -DGCC_WARN -ansi -pedantic
+CC=gcc -Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -DGCC_WARN -ansi -pedantic -Wno-long-long
 
 #
 # You shouldn't need to change anything below here.

diff --git a/sys/unix/hints/macosx10.7 b/sys/unix/hints/macosx10.7
index cc921688450280d9a92f9baa0220c86a01e43812..776cb4b810ae2573c940524a54dd6c96e23d4dfb 100644 (file)
--- a/sys/unix/hints/macosx10.7
+++ b/sys/unix/hints/macosx10.7
@@ -63,7 +63,7 @@ CC=gcc
 #
 
 #CFLAGS+=-W -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -DGCC_WARN
-CFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -DGCC_WARN -ansi -pedantic
+CFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -DGCC_WARN -ansi -pedantic -Wno-long-long
 # As of LLVM build 2336.1.00, this gives dozens of spurious messages, so
 # leave it out by default.
 #CFLAGS+=-Wunreachable-code

diff --git a/sys/unix/hints/macosx10.8 b/sys/unix/hints/macosx10.8
index 6a1f69d4be540dccde4b5d97fb00ba339424c291..87d0e83055b9d31c932cc7e6c7a0406e3a7afa58 100644 (file)
--- a/sys/unix/hints/macosx10.8
+++ b/sys/unix/hints/macosx10.8
@@ -70,7 +70,7 @@ CC=gcc
 #
 
 #CFLAGS+=-W -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -DGCC_WARN
-CFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -DGCC_WARN -ansi -pedantic
+CFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -DGCC_WARN -ansi -pedantic -Wno-long-long
 # As of LLVM build 2336.1.00, this gives dozens of spurious messages, so
 # leave it out by default.
 #CFLAGS+=-Wunreachable-code