C90: add inline macro to xdiff and mbedtls

b3384af2 · Peter Pettersson · 61f1e31a · b3384af2 · b3384af2
Commit b3384af2 authored Feb 03, 2022 by Peter Pettersson
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 6 deletions

src/streams/mbedtls.c
+8 -6

src/xdiff/git-xdiff.h
+11 -0

No files found.
--- a/src/streams/mbedtls.c
+++ b/src/streams/mbedtls.c
@@ -23,12 +23,14 @@
 #endif

 /* Work around C90-conformance issues */
-#if defined(_MSC_VER)
-# define inline __inline
-#elif defined(__GNUC__)
-# define inline __inline__
-#else
-# define inline
+#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
+# if defined(_MSC_VER)
+#  define inline __inline
+# elif defined(__GNUC__)
+#  define inline __inline__
+# else
+#  define inline
+# endif
 #endif

 #include <mbedtls/config.h>

--- a/src/xdiff/git-xdiff.h
+++ b/src/xdiff/git-xdiff.h
@@ -16,6 +16,17 @@

 #include "regexp.h"

+/* Work around C90-conformance issues */
+#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
+# if defined(_MSC_VER)
+#  define inline __inline
+# elif defined(__GNUC__)
+#  define inline __inline__
+# else
+#  define inline
+# endif
+#endif
+
 #define xdl_malloc(x) git__malloc(x)
 #define xdl_free(ptr) git__free(ptr)
 #define xdl_realloc(ptr, x) git__realloc(ptr, x)