Commit 01e5f800 authored by Stefan Krah's avatar Stefan Krah

Fix C++ header usage. This __STDC_LIMIT_MACROS scheme can still be subverted

by including stdint.h before mpdecimal.h.  In that case the only option left
is to compile with -D_STDC_LIMIT_MACROS.
parent 956040a7
...@@ -32,6 +32,10 @@ ...@@ -32,6 +32,10 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#define MPD_CLEAR_STDC_LIMIT_MACROS
#endif
#endif #endif
...@@ -55,18 +59,12 @@ extern "C" { ...@@ -55,18 +59,12 @@ extern "C" {
#define MPD_HIDE_SYMBOLS_END #define MPD_HIDE_SYMBOLS_END
#define EXTINLINE extern inline #define EXTINLINE extern inline
#else #else
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
#ifdef HAVE_INTTYPES_H #ifdef HAVE_INTTYPES_H
#include <inttypes.h> #include <inttypes.h>
#endif #endif
#ifdef HAVE_STDINT_H
#if defined(__cplusplus) && !defined(__STDC_LIMIT_MACROS)
#define __STDC_LIMIT_MACROS
#include <stdint.h>
#undef __STDC_LIMIT_MACROS
#else
#include <stdint.h>
#endif
#endif
#ifndef __GNUC_STDC_INLINE__ #ifndef __GNUC_STDC_INLINE__
#define __GNUC_STDC_INLINE__ 1 #define __GNUC_STDC_INLINE__ 1
#endif #endif
...@@ -835,6 +833,10 @@ MPD_PRAGMA(MPD_HIDE_SYMBOLS_END) /* restore previous scope rules */ ...@@ -835,6 +833,10 @@ MPD_PRAGMA(MPD_HIDE_SYMBOLS_END) /* restore previous scope rules */
#ifdef __cplusplus #ifdef __cplusplus
#ifdef MPD_CLEAR_STDC_LIMIT_MACROS
#undef MPD_CLEAR_STDC_LIMIT_MACROS
#undef __STDC_LIMIT_MACROS
#endif
} /* END extern "C" */ } /* END extern "C" */
#endif #endif
......
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