giochannel: Add an out annotation for g_io_channel_read_unichar()

[platform/upstream/glib.git] / glib / gcharset.c

diff --git a/glib/gcharset.c b/glib/gcharset.c
index d5e17bf..bb8c044 100644 (file)
--- a/glib/gcharset.c
+++ b/glib/gcharset.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "gcharset.h"
+#include "gcharsetprivate.h"
 
 #include "garray.h"
 #include "genviron.h"
@@ -28,6 +28,9 @@
 #include "gmessages.h"
 #include "gstrfuncs.h"
 #include "gthread.h"
+#ifdef G_OS_WIN32
+#include "gwin32.h"
+#endif
 
 #include "libcharset/libcharset.h"
 
@@ -84,7 +87,7 @@ get_alias_hash (void)
 /* As an abuse of the alias table, the following routines gets
  * the charsets that are aliases for the canonical name.
  */
-G_GNUC_INTERNAL const char **
+const char **
 _g_charset_get_aliases (const char *canonical_name)
 {
   GHashTable *alias_hash = get_alias_hash ();
@@ -468,15 +471,15 @@ guess_category_value (const gchar *category_name)
 {
   const gchar *retval;
 
-  /* The highest priority value is the `LANGUAGE' environment
+  /* The highest priority value is the 'LANGUAGE' environment
      variable.  This is a GNU extension.  */
   retval = g_getenv ("LANGUAGE");
   if ((retval != NULL) && (retval[0] != '\0'))
     return retval;
 
-  /* `LANGUAGE' is not set.  So we have to proceed with the POSIX
-     methods of looking to `LC_ALL', `LC_xxx', and `LANG'.  On some
-     systems this can be done by the `setlocale' function itself.  */
+  /* 'LANGUAGE' is not set.  So we have to proceed with the POSIX
+     methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.  On some
+     systems this can be done by the 'setlocale' function itself.  */
 
   /* Setting of LC_ALL overwrites all other.  */
   retval = g_getenv ("LC_ALL");