diff options
| author | Max Kellermann <max@duempel.org> | 2013-08-03 23:47:31 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-08-03 23:47:31 +0200 |
| commit | acd742d22593a52d2e5f5bcdb2c81175d61c9b11 (patch) | |
| tree | d092949de9df27fd1663eb5ead1c64b8532ef840 | |
| parent | d1e7b4e38136f9342aad76c685a13adf0e69f869 (diff) | |
| download | mpd-acd742d22593a52d2e5f5bcdb2c81175d61c9b11.tar.gz mpd-acd742d22593a52d2e5f5bcdb2c81175d61c9b11.tar.xz mpd-acd742d22593a52d2e5f5bcdb2c81175d61c9b11.zip | |
ConfigData: remove C++ checks
| -rw-r--r-- | src/ConfigData.hxx | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/ConfigData.hxx b/src/ConfigData.hxx index b5ec30efd..a70426f11 100644 --- a/src/ConfigData.hxx +++ b/src/ConfigData.hxx @@ -24,13 +24,9 @@ #include "gerror.h" #include "gcc.h" -#ifdef __cplusplus #include <string> #include <array> #include <vector> -#endif - -#ifdef __cplusplus struct block_param { std::string name; @@ -48,8 +44,6 @@ struct block_param { :name(_name), value(_value), line(_line), used(false) {} }; -#endif - struct config_param { /** * The next config_param with the same name. The destructor @@ -60,7 +54,6 @@ struct config_param { char *value; unsigned int line; -#ifdef __cplusplus std::vector<block_param> block_params; /** @@ -89,21 +82,12 @@ struct config_param { gcc_nonnull_all gcc_pure const block_param *GetBlockParam(const char *_name) const; -#endif }; -#ifdef __cplusplus - struct ConfigData { std::array<config_param *, std::size_t(CONF_MAX)> params; }; -#endif - -#ifdef __cplusplus -extern "C" { -#endif - gcc_pure const char * config_get_block_string(const struct config_param *param, const char *name, @@ -133,8 +117,4 @@ bool config_get_block_bool(const struct config_param *param, const char *name, bool default_value); -#ifdef __cplusplus -} -#endif - #endif |