Browse Source

The inline keyword is not part of C in visual studio but is part of C++ and it is illegal to re-define a C++ keyword. This change makes it so that we define the inline only when this header file is included in C.

pull/2/merge
Francois Coulombe 7 years ago
parent
commit
0ea3c97cda
2 changed files with 3 additions and 1 deletions
  1. +2
    -0
      build-windows/libetpan-config.h
  2. +1
    -1
      libetpan-config.h.in

+ 2
- 0
build-windows/libetpan-config.h View File

@ -80,7 +80,9 @@
#include <limits.h>
#ifdef _MSC_VER
# define MMAP_UNAVAILABLE
# ifndef __cplusplus
# define inline __inline
# endif
#else
# include <sys/param.h>
#endif


+ 1
- 1
libetpan-config.h.in View File

@ -9,7 +9,7 @@
@if WIN32
@ define MMAP_UNAVAILABLE
@endif
@ifdef _MSC_VER
@if defined(_MSC_VER) && !defined(__cplusplus)
@ define inline __inline
@endif
#ifdef HAVE_LIMITS_H


Loading…
Cancel
Save