mirror of
https://github.com/etlegacy/etlegacy-libs.git
synced 2025-04-08 23:42:48 +00:00
client: fixed tinygettext compilation on Windows, refs #172
This commit is contained in:
parent
68c7831dcb
commit
aebfdc9676
3 changed files with 8 additions and 4 deletions
|
@ -46,7 +46,8 @@ DictionaryManager::DictionaryManager(const std::string& charset_) :
|
|||
current_language(),
|
||||
current_dict(0),
|
||||
empty_dict(),
|
||||
filesystem(new UnixFileSystem)
|
||||
filesystem(0)
|
||||
//filesystem(new UnixFileSystem)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#ifdef HAVE_SDL
|
||||
#ifdef BUNDLED_SDL // Using SDL iconv
|
||||
# include "SDL.h"
|
||||
|
||||
# define tinygettext_ICONV_CONST const
|
||||
|
@ -27,7 +27,9 @@
|
|||
# define tinygettext_iconv SDL_iconv
|
||||
# define tinygettext_iconv_open SDL_iconv_open
|
||||
# define tinygettext_iconv_close SDL_iconv_close
|
||||
#else
|
||||
|
||||
#else // Using pure iconv
|
||||
|
||||
# include <iconv.h>
|
||||
|
||||
# ifdef HAVE_ICONV_CONST
|
||||
|
@ -40,6 +42,7 @@
|
|||
# define tinygettext_iconv iconv
|
||||
# define tinygettext_iconv_open iconv_open
|
||||
# define tinygettext_iconv_close iconv_close
|
||||
|
||||
#endif
|
||||
|
||||
namespace tinygettext {
|
||||
|
|
|
@ -53,7 +53,7 @@ private:
|
|||
void get_string_line(std::ostringstream& str,unsigned int skip);
|
||||
bool is_empty_line();
|
||||
bool prefix(const char* );
|
||||
void error(const std::string& msg) __attribute__((__noreturn__));
|
||||
void error(const std::string& msg); // throws an error on Windows: __attribute__((__noreturn__));
|
||||
void warning(const std::string& msg);
|
||||
|
||||
public:
|
||||
|
|
Loading…
Reference in a new issue