diff --git a/sysmodule/lib/minIni/dev/minIni.h b/sysmodule/lib/minIni/dev/minIni.h index afbe5042..73e33c01 100644 --- a/sysmodule/lib/minIni/dev/minIni.h +++ b/sysmodule/lib/minIni/dev/minIni.h @@ -65,94 +65,4 @@ int ini_browse(INI_CALLBACK Callback, void *UserData, const mTCHAR *Filename); } #endif - -#if defined __cplusplus - -#if defined __WXWINDOWS__ - #include "wxMinIni.h" -#else - #include - - /* The C++ class in minIni.h was contributed by Steven Van Ingelgem. */ - class minIni - { - public: - minIni(const std::string& filename) : iniFilename(filename) - { } - - bool getbool(const std::string& Section, const std::string& Key, bool DefValue=false) const - { return ini_getbool(Section.c_str(), Key.c_str(), int(DefValue), iniFilename.c_str()) != 0; } - - long getl(const std::string& Section, const std::string& Key, long DefValue=0) const - { return ini_getl(Section.c_str(), Key.c_str(), DefValue, iniFilename.c_str()); } - - int geti(const std::string& Section, const std::string& Key, int DefValue=0) const - { return static_cast(this->getl(Section, Key, long(DefValue))); } - - std::string gets(const std::string& Section, const std::string& Key, const std::string& DefValue="") const - { - char buffer[INI_BUFFERSIZE]; - ini_gets(Section.c_str(), Key.c_str(), DefValue.c_str(), buffer, INI_BUFFERSIZE, iniFilename.c_str()); - return buffer; - } - - std::string getsection(int idx) const - { - char buffer[INI_BUFFERSIZE]; - ini_getsection(idx, buffer, INI_BUFFERSIZE, iniFilename.c_str()); - return buffer; - } - - std::string getkey(const std::string& Section, int idx) const - { - char buffer[INI_BUFFERSIZE]; - ini_getkey(Section.c_str(), idx, buffer, INI_BUFFERSIZE, iniFilename.c_str()); - return buffer; - } - -#if defined INI_REAL - INI_REAL getf(const std::string& Section, const std::string& Key, INI_REAL DefValue=0) const - { return ini_getf(Section.c_str(), Key.c_str(), DefValue, iniFilename.c_str()); } -#endif - -#if ! defined INI_READONLY - bool put(const std::string& Section, const std::string& Key, long Value) - { return ini_putl(Section.c_str(), Key.c_str(), Value, iniFilename.c_str()) != 0; } - - bool put(const std::string& Section, const std::string& Key, int Value) - { return ini_putl(Section.c_str(), Key.c_str(), (long)Value, iniFilename.c_str()) != 0; } - - bool put(const std::string& Section, const std::string& Key, bool Value) - { return ini_putl(Section.c_str(), Key.c_str(), (long)Value, iniFilename.c_str()) != 0; } - - bool put(const std::string& Section, const std::string& Key, const std::string& Value) - { return ini_puts(Section.c_str(), Key.c_str(), Value.c_str(), iniFilename.c_str()) != 0; } - - bool put(const std::string& Section, const std::string& Key, const char* Value) - { return ini_puts(Section.c_str(), Key.c_str(), Value, iniFilename.c_str()) != 0; } - -#if defined INI_REAL - bool put(const std::string& Section, const std::string& Key, INI_REAL Value) - { return ini_putf(Section.c_str(), Key.c_str(), Value, iniFilename.c_str()) != 0; } -#endif - - bool del(const std::string& Section, const std::string& Key) - { return ini_puts(Section.c_str(), Key.c_str(), 0, iniFilename.c_str()) != 0; } - - bool del(const std::string& Section) - { return ini_puts(Section.c_str(), 0, 0, iniFilename.c_str()) != 0; } -#endif - -#if !defined INI_NOBROWSE - bool browse(INI_CALLBACK Callback, void *UserData) const - { return ini_browse(Callback, UserData, iniFilename.c_str()) != 0; } -#endif - - private: - std::string iniFilename; - }; - -#endif /* __WXWINDOWS__ */ -#endif /* __cplusplus */ - #endif /* MININI_H */ diff --git a/sysmodule/lib/nxExt/Makefile b/sysmodule/lib/nxExt/Makefile index 1c291cd2..34be0db8 100644 --- a/sysmodule/lib/nxExt/Makefile +++ b/sysmodule/lib/nxExt/Makefile @@ -30,7 +30,7 @@ CFLAGS := -g -Wall -Werror \ $(ARCH) \ $(BUILD_CFLAGS) -CFLAGS += $(INCLUDE) +CFLAGS += $(INCLUDE) -std=gnu11 CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions diff --git a/sysmodule/src/config.h b/sysmodule/src/config.h index 7bc192d3..8893fd62 100644 --- a/sysmodule/src/config.h +++ b/sysmodule/src/config.h @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include