Thanks to visit codestin.com
Credit goes to github.com

Skip to content

please pull to master and mono-2-8 too. #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rnagy wants to merge 3 commits into from
Closed

please pull to master and mono-2-8 too. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d518059
Use locale_charset() from iconv which will use nl_langinfo (CODESET) …
rnagy Oct 14, 2010
6226950
Merge remote branch 'upstream/master'
rnagy Oct 15, 2010
cdbbe61
Merge remote branch 'upstream/master'
rnagy Oct 15, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eglib/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ if test "x$have_iso_varargs" = "xyes"; then
fi
AC_SUBST(G_HAVE_ISO_VARARGS)

AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h)
AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h iconv.h localcharset.h)

if test $ac_cv_sizeof_void_p != $ac_cv_sizeof_int; then
GPOINTER_TO_INT="((gint)(long) (ptr))"
Expand Down
7 changes: 5 additions & 2 deletions eglib/src/gunicode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
# ifdef HAVE_ICONV_H
# include <iconv.h>
# endif
# ifdef HAVE_LOCALCHARSET_H
# include <localcharset.h>
# endif
#endif

static char *my_charset;
Expand Down Expand Up @@ -305,8 +308,8 @@ g_get_charset (G_CONST_RETURN char **charset)
#else
if (my_charset == NULL){
/* These shouldn't be heap allocated */
#if HAVE_LANGINFO_H
my_charset = nl_langinfo (CODESET);
#if HAVE_LOCALCHARSET_H
my_charset = locale_charset ();
#else
my_charset = "UTF-8";
#endif
Expand Down