Skip to content

G
git2
Unverified Commit 8d967d85 by Edward Thomson Committed by GitHub
Options

Merge pull request #6200 from boretrk/c90 

C90: add inline macro to xdiff and mbedtls
parents 61f1e31a b3384af2
Showing with 19 additions and 6 deletions
src/streams/mbedtls.c
...@@ -23,12 +23,14 @@ ...@@ -23,12 +23,14 @@
#endif #endif
/* Work around C90-conformance issues */ /* Work around C90-conformance issues */
#if defined(_MSC_VER) #if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
# define inline __inline # if defined(_MSC_VER)
#elif defined(__GNUC__) # define inline __inline
# define inline __inline__ # elif defined(__GNUC__)
#else # define inline __inline__
# define inline # else
# define inline
# endif
#endif #endif
#include <mbedtls/config.h> #include <mbedtls/config.h>
......
src/xdiff/git-xdiff.h
...@@ -16,6 +16,17 @@ ...@@ -16,6 +16,17 @@
#include "regexp.h" #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_malloc(x) git__malloc(x)
#define xdl_free(ptr) git__free(ptr) #define xdl_free(ptr) git__free(ptr)
#define xdl_realloc(ptr, x) git__realloc(ptr, x) #define xdl_realloc(ptr, x) git__realloc(ptr, x)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment