Revert "use inline functions instead of macros in charset.h"

This reverts commit 7f2a635ac5.
This commit is contained in:
Andrzej Rybczak
2009-03-17 23:57:36 +01:00
parent 42b11910cc
commit 503c4964d5

View File

@@ -25,10 +25,10 @@
#include <config.h> #include <config.h>
#endif #endif
#include <string>
#if defined(SUPPORTED_LOCALES) && defined(HAVE_ICONV_H) #if defined(SUPPORTED_LOCALES) && defined(HAVE_ICONV_H)
#include <string>
void init_current_locale(); void init_current_locale();
void utf_to_locale(std::string &); void utf_to_locale(std::string &);
@@ -42,16 +42,16 @@ void str_pool_locale_to_utf(char *&);
#else #else
void init_current_locale() { } #define init_current_locale();
void utf_to_locale(std::string &) { } #define utf_to_locale(x);
void locale_to_utf(std::string &) { } #define locale_to_utf(x);
std::string &utf_to_locale_cpy(const std::string &s) { return s; } #define utf_to_locale_cpy(x) (x)
std::string &locale_to_utf_cpy(const std::string &s) { return s; } #define locale_to_utf_cpy(x) (x)
void str_pool_utf_to_locale(char *&) { } #define str_pool_utf_to_locale(x);
void str_pool_locale_to_utf(char *&) { } #define str_pool_locale_to_utf(x);
#endif // SUPPORTED_LOCALES && HAVE_ICONV_H #endif // SUPPORTED_LOCALES && HAVE_ICONV_H