luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-28 15:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
ae95bec669
glib/glib/gwin32.c

741 lines
20 KiB
C
Raw Normal View History

glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1998 Peter Mattis, Spencer Kimball and Josh MacDonald
* Copyright (C) 1998-1999 Tor Lillqvist
*
* This library is free software; you can redistribute it and/or
applied patch from Andreas Persenius <ndap@swipnet.se> that updates the Wed Jul 26 12:59:31 2000 Tim Janik <timj@gtk.org> * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that updates the license headers to the GNU Lesser General Public License, as well as updating the copyright year to 2000.
2000-07-26 13:02:02 +02:00
* modify it under the terms of the GNU Lesser General Public
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
applied patch from Andreas Persenius <ndap@swipnet.se> that updates the Wed Jul 26 12:59:31 2000 Tim Janik <timj@gtk.org> * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that updates the license headers to the GNU Lesser General Public License, as well as updating the copyright year to 2000.
2000-07-26 13:02:02 +02:00
* Lesser General Public License for more details.
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
*
applied patch from Andreas Persenius <ndap@swipnet.se> that updates the Wed Jul 26 12:59:31 2000 Tim Janik <timj@gtk.org> * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that updates the license headers to the GNU Lesser General Public License, as well as updating the copyright year to 2000.
2000-07-26 13:02:02 +02:00
* You should have received a copy of the GNU Lesser General Public
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
applied patch from Andreas Persenius <ndap@swipnet.se> that updates the Wed Jul 26 12:59:31 2000 Tim Janik <timj@gtk.org> * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that updates the license headers to the GNU Lesser General Public License, as well as updating the copyright year to 2000.
2000-07-26 13:02:02 +02:00
* Modified by the GLib Team and others 1997-2000. See the AUTHORS
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
* file for a list of people on the GLib Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
/*
* MT safe for the unix part, FIXME: make the win32 part MT safe as well.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "glibconfig.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#define STRICT /* Strict typing, please */
#include <windows.h>
Cygwin support contributed by Stefan Ondrejicka <ondrej@idata.sk>. 2001-02-21 Tor Lillqvist <tml@iki.fi> Cygwin support contributed by Stefan Ondrejicka <ondrej@idata.sk>. Hopefully I got it all in while simultaneously adding support for auto*/libtool for mingw. * Makefile.am: Changes for auto* support on Cygwin and Win32. Do still distribute the hand-written makefiles and *.win32.in files, though. Use GIO, GSPAWN and PLATFORMDEP macros set by configure. Use -no-undefined. Pass -export-symbols glib.def to libtool. * configure.in: Define G_PLATFORM_WIN32 on both pure Win32 (mingw) and Cygwin. Add AC_CYGWIN, AC_EXEEXT and AC_LIBTOOL_WIN32_DLL calls for Cygwin and mingw support. Check for %I64u guint64 format (in MS C library). Set G_MODULE_IMPL on mingw and Cygwin. Use ac_object and ac_exeext. Set GIO, GSPAWN, PLATFORMDEP and G_LIBS_EXTRA. Compile timeloop only on Unix. Define OS_WIN32 automake conditional on Win32. * glib.h: Include gwin32.h also on Cygwin. * gfileutils.c (get_contents_posix): Use O_BINARY (defined as 0 on Unix) for Cygwin's sake. * gtimer.c (GETTIME): Reduce #ifdefs, use a macro GETTIME(). * gconvert.c * gthread.c * gutf8.c * gutils.c: For code needed both on Cygwin and native Win32, test for G_PLATFORM_WIN32. * gmarkup.h: Use G_BEGIN_DECLS and G_END_DECLS. * gtypes.h: Refine GLIB_VAR definition. Also check for DLL_EXPORT in case compiling a static library on Win32 or Cygwin. * gwin32.c: No <direct.h> on Cygwin. No need for ftruncate() or dirent emulation on Cygwin. (get_package_directory_from_module) Convert return value from GetModuleFileName() to POSIX path on Cygwin. * tests/Makefile.am (progs_LDADD): Link with libglib, libgthread and libgmodule as appropriate. Use -no-undefined. * gbacktrace.c: Move #ifdefs around a bit on Win32. * gshell.c (unquote_string_inplace): Make static. * testglib.c: Make some vars static. Add Cygwin path tests.
2001-03-09 22:31:21 +01:00
#undef STRICT
#ifndef G_WITH_CYGWIN
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
#include <direct.h>
Cygwin support contributed by Stefan Ondrejicka <ondrej@idata.sk>. 2001-02-21 Tor Lillqvist <tml@iki.fi> Cygwin support contributed by Stefan Ondrejicka <ondrej@idata.sk>. Hopefully I got it all in while simultaneously adding support for auto*/libtool for mingw. * Makefile.am: Changes for auto* support on Cygwin and Win32. Do still distribute the hand-written makefiles and *.win32.in files, though. Use GIO, GSPAWN and PLATFORMDEP macros set by configure. Use -no-undefined. Pass -export-symbols glib.def to libtool. * configure.in: Define G_PLATFORM_WIN32 on both pure Win32 (mingw) and Cygwin. Add AC_CYGWIN, AC_EXEEXT and AC_LIBTOOL_WIN32_DLL calls for Cygwin and mingw support. Check for %I64u guint64 format (in MS C library). Set G_MODULE_IMPL on mingw and Cygwin. Use ac_object and ac_exeext. Set GIO, GSPAWN, PLATFORMDEP and G_LIBS_EXTRA. Compile timeloop only on Unix. Define OS_WIN32 automake conditional on Win32. * glib.h: Include gwin32.h also on Cygwin. * gfileutils.c (get_contents_posix): Use O_BINARY (defined as 0 on Unix) for Cygwin's sake. * gtimer.c (GETTIME): Reduce #ifdefs, use a macro GETTIME(). * gconvert.c * gthread.c * gutf8.c * gutils.c: For code needed both on Cygwin and native Win32, test for G_PLATFORM_WIN32. * gmarkup.h: Use G_BEGIN_DECLS and G_END_DECLS. * gtypes.h: Refine GLIB_VAR definition. Also check for DLL_EXPORT in case compiling a static library on Win32 or Cygwin. * gwin32.c: No <direct.h> on Cygwin. No need for ftruncate() or dirent emulation on Cygwin. (get_package_directory_from_module) Convert return value from GetModuleFileName() to POSIX path on Cygwin. * tests/Makefile.am (progs_LDADD): Link with libglib, libgthread and libgmodule as appropriate. Use -no-undefined. * gbacktrace.c: Move #ifdefs around a bit on Win32. * gshell.c (unquote_string_inplace): Make static. * testglib.c: Make some vars static. Add Cygwin path tests.
2001-03-09 22:31:21 +01:00
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
#include <errno.h>
#include <ctype.h>
#ifdef _MSC_VER
# include <io.h>
#endif /* _MSC_VER */
#include "glib.h"
Cygwin support contributed by Stefan Ondrejicka <ondrej@idata.sk>. 2001-02-21 Tor Lillqvist <tml@iki.fi> Cygwin support contributed by Stefan Ondrejicka <ondrej@idata.sk>. Hopefully I got it all in while simultaneously adding support for auto*/libtool for mingw. * Makefile.am: Changes for auto* support on Cygwin and Win32. Do still distribute the hand-written makefiles and *.win32.in files, though. Use GIO, GSPAWN and PLATFORMDEP macros set by configure. Use -no-undefined. Pass -export-symbols glib.def to libtool. * configure.in: Define G_PLATFORM_WIN32 on both pure Win32 (mingw) and Cygwin. Add AC_CYGWIN, AC_EXEEXT and AC_LIBTOOL_WIN32_DLL calls for Cygwin and mingw support. Check for %I64u guint64 format (in MS C library). Set G_MODULE_IMPL on mingw and Cygwin. Use ac_object and ac_exeext. Set GIO, GSPAWN, PLATFORMDEP and G_LIBS_EXTRA. Compile timeloop only on Unix. Define OS_WIN32 automake conditional on Win32. * glib.h: Include gwin32.h also on Cygwin. * gfileutils.c (get_contents_posix): Use O_BINARY (defined as 0 on Unix) for Cygwin's sake. * gtimer.c (GETTIME): Reduce #ifdefs, use a macro GETTIME(). * gconvert.c * gthread.c * gutf8.c * gutils.c: For code needed both on Cygwin and native Win32, test for G_PLATFORM_WIN32. * gmarkup.h: Use G_BEGIN_DECLS and G_END_DECLS. * gtypes.h: Refine GLIB_VAR definition. Also check for DLL_EXPORT in case compiling a static library on Win32 or Cygwin. * gwin32.c: No <direct.h> on Cygwin. No need for ftruncate() or dirent emulation on Cygwin. (get_package_directory_from_module) Convert return value from GetModuleFileName() to POSIX path on Cygwin. * tests/Makefile.am (progs_LDADD): Link with libglib, libgthread and libgmodule as appropriate. Use -no-undefined. * gbacktrace.c: Move #ifdefs around a bit on Win32. * gshell.c (unquote_string_inplace): Make static. * testglib.c: Make some vars static. Add Cygwin path tests.
2001-03-09 22:31:21 +01:00
#ifdef G_WITH_CYGWIN
#include <sys/cygwin.h>
#endif
#ifndef G_WITH_CYGWIN
gint
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
g_win32_ftruncate (gint fd,
guint size)
{
HANDLE hfile;
guint curpos;
g_return_val_if_fail (fd >= 0, -1);
hfile = (HANDLE) _get_osfhandle (fd);
curpos = SetFilePointer (hfile, 0, NULL, FILE_CURRENT);
if (curpos == 0xFFFFFFFF
|| SetFilePointer (hfile, size, NULL, FILE_BEGIN) == 0xFFFFFFFF
|| !SetEndOfFile (hfile))
{
gint error = GetLastError ();
switch (error)
{
case ERROR_INVALID_HANDLE:
errno = EBADF;
break;
default:
errno = EIO;
break;
}
return -1;
}
return 0;
}
Cygwin support contributed by Stefan Ondrejicka <ondrej@idata.sk>. 2001-02-21 Tor Lillqvist <tml@iki.fi> Cygwin support contributed by Stefan Ondrejicka <ondrej@idata.sk>. Hopefully I got it all in while simultaneously adding support for auto*/libtool for mingw. * Makefile.am: Changes for auto* support on Cygwin and Win32. Do still distribute the hand-written makefiles and *.win32.in files, though. Use GIO, GSPAWN and PLATFORMDEP macros set by configure. Use -no-undefined. Pass -export-symbols glib.def to libtool. * configure.in: Define G_PLATFORM_WIN32 on both pure Win32 (mingw) and Cygwin. Add AC_CYGWIN, AC_EXEEXT and AC_LIBTOOL_WIN32_DLL calls for Cygwin and mingw support. Check for %I64u guint64 format (in MS C library). Set G_MODULE_IMPL on mingw and Cygwin. Use ac_object and ac_exeext. Set GIO, GSPAWN, PLATFORMDEP and G_LIBS_EXTRA. Compile timeloop only on Unix. Define OS_WIN32 automake conditional on Win32. * glib.h: Include gwin32.h also on Cygwin. * gfileutils.c (get_contents_posix): Use O_BINARY (defined as 0 on Unix) for Cygwin's sake. * gtimer.c (GETTIME): Reduce #ifdefs, use a macro GETTIME(). * gconvert.c * gthread.c * gutf8.c * gutils.c: For code needed both on Cygwin and native Win32, test for G_PLATFORM_WIN32. * gmarkup.h: Use G_BEGIN_DECLS and G_END_DECLS. * gtypes.h: Refine GLIB_VAR definition. Also check for DLL_EXPORT in case compiling a static library on Win32 or Cygwin. * gwin32.c: No <direct.h> on Cygwin. No need for ftruncate() or dirent emulation on Cygwin. (get_package_directory_from_module) Convert return value from GetModuleFileName() to POSIX path on Cygwin. * tests/Makefile.am (progs_LDADD): Link with libglib, libgthread and libgmodule as appropriate. Use -no-undefined. * gbacktrace.c: Move #ifdefs around a bit on Win32. * gshell.c (unquote_string_inplace): Make static. * testglib.c: Make some vars static. Add Cygwin path tests.
2001-03-09 22:31:21 +01:00
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
/**
* g_win32_getlocale:
*
* The setlocale in the Microsoft C library uses locale names of the
* form "English_United States.1252" etc. We want the Unixish standard
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
* form "en_US", "zh_TW" etc. This function gets the current thread
* locale from Windows - without any encoding info - and returns it as
* a string of the above form for use in forming file names etc. The
* returned string should be deallocated with g_free().
docs 2001-04-16 Havoc Pennington <hp@redhat.com> * gqsort.c: docs * gfileutils.c: docs * gwin32.c: docs fixes * gconvert.c: docs * guniprop.c: docs * gutf8.c: docs
2001-04-16 22:05:25 +02:00
*
Documentation cleanups. (#61487) 2001-10-01 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Documentation cleanups. (#61487)
2001-10-01 20:54:27 +02:00
* Returns: newly-allocated locale name.
New function (DLL entry point) to tuck away actual DLL name. 2001-10-03 Tor Lillqvist <tml@iki.fi> * glib/gutils.c (Win32) (DllMain): New function (DLL entry point) to tuck away actual DLL name. (GLIB_LOCALE_DIR) Use actual DLL name, instead of assuming one naming convention for DLLs. * glib/glib.def: g_string_append_printf.
2001-10-03 22:19:13 +02:00
**/
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
gchar *
g_win32_getlocale (void)
{
Look at env vars LC_ALL, LC_CTYPE and LANG first. Some refinements to the 1999-11-08 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale): Look at env vars LC_ALL, LC_CTYPE and LANG first. Some refinements to the sublanguage logic.
1999-11-08 10:49:10 +01:00
LCID lcid;
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
LANGID langid;
Look at env vars LC_ALL, LC_CTYPE and LANG first. Some refinements to the 1999-11-08 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale): Look at env vars LC_ALL, LC_CTYPE and LANG first. Some refinements to the sublanguage logic.
1999-11-08 10:49:10 +01:00
gchar *ev;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
gint primary, sub;
gchar *l = NULL, *sl = NULL;
gchar bfr[20];
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
/* Let the user override the system settings through environment
variables, as on POSIX systems. */
if (((ev = getenv ("LC_ALL")) != NULL && ev[0] != '\0')
|| ((ev = getenv ("LC_MESSAGES")) != NULL && ev[0] != '\0')
|| ((ev = getenv ("LANG")) != NULL && ev[0] != '\0'))
Look at env vars LC_ALL, LC_CTYPE and LANG first. Some refinements to the 1999-11-08 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale): Look at env vars LC_ALL, LC_CTYPE and LANG first. Some refinements to the sublanguage logic.
1999-11-08 10:49:10 +01:00
return g_strdup (ev);
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
/* Use native Win32 API locale ID. */
Look at env vars LC_ALL, LC_CTYPE and LANG first. Some refinements to the 1999-11-08 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale): Look at env vars LC_ALL, LC_CTYPE and LANG first. Some refinements to the sublanguage logic.
1999-11-08 10:49:10 +01:00
lcid = GetThreadLocale ();
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
/* Strip off the sorting rules, keep only the language part. */
langid = LANGIDFROMLCID (lcid);
/* Split into language and territory part. */
primary = PRIMARYLANGID (langid);
sub = SUBLANGID (langid);
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
switch (primary)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_AFRIKAANS: l = "af"; sl = "ZA"; break;
case LANG_ALBANIAN: l = "sq"; sl = "AL"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_ARABIC:
l = "ar";
switch (sub)
{
case SUBLANG_ARABIC_SAUDI_ARABIA: sl = "SA"; break;
case SUBLANG_ARABIC_IRAQ: sl = "IQ"; break;
case SUBLANG_ARABIC_EGYPT: sl = "EG"; break;
case SUBLANG_ARABIC_LIBYA: sl = "LY"; break;
case SUBLANG_ARABIC_ALGERIA: sl = "DZ"; break;
case SUBLANG_ARABIC_MOROCCO: sl = "MA"; break;
case SUBLANG_ARABIC_TUNISIA: sl = "TN"; break;
case SUBLANG_ARABIC_OMAN: sl = "OM"; break;
case SUBLANG_ARABIC_YEMEN: sl = "YE"; break;
case SUBLANG_ARABIC_SYRIA: sl = "SY"; break;
case SUBLANG_ARABIC_JORDAN: sl = "JO"; break;
case SUBLANG_ARABIC_LEBANON: sl = "LB"; break;
case SUBLANG_ARABIC_KUWAIT: sl = "KW"; break;
case SUBLANG_ARABIC_UAE: sl = "AE"; break;
case SUBLANG_ARABIC_BAHRAIN: sl = "BH"; break;
case SUBLANG_ARABIC_QATAR: sl = "QA"; break;
}
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef LANG_ARMENIAN
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_ARMENIAN: l = "hy"; sl = "AM"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_ASSAMESE
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_ASSAMESE: l = "as"; sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_AZERI
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_AZERI:
l = "az";
static correctness 2001-11-03 Hans Breuer <hans@breuer.org> * glib/giowin32.c : static correctness * glib/gwin32.c : some more #if defined (SUBLANG_* ... (g_win32_get_package_installation_subdirectory) use g_build_filename instead of duplicating its logic * glib/glib.def : removed duplicates, added mising, removed compat cruft
2001-11-03 17:51:10 +01:00
#if defined (SUBLANG_AZERI_LATIN) && defined (SUBLANG_AZERI_CYRILLIC)
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
switch (sub)
{
/* FIXME: Adjust this when Azerbaijani locales appear on Unix. */
case SUBLANG_AZERI_LATIN: sl = "@latin"; break;
case SUBLANG_AZERI_CYRILLIC: sl = "@cyrillic"; break;
}
static correctness 2001-11-03 Hans Breuer <hans@breuer.org> * glib/giowin32.c : static correctness * glib/gwin32.c : some more #if defined (SUBLANG_* ... (g_win32_get_package_installation_subdirectory) use g_build_filename instead of duplicating its logic * glib/glib.def : removed duplicates, added mising, removed compat cruft
2001-11-03 17:51:10 +01:00
#endif
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_BASQUE:
l = "eu"; /* sl could be "ES" or "FR". */
break;
case LANG_BELARUSIAN: l = "be"; sl = "BY"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef LANG_BENGALI
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_BENGALI: l = "bn"; sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_BULGARIAN: l = "bg"; sl = "BG"; break;
case LANG_CATALAN: l = "ca"; sl = "ES"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_CHINESE:
l = "zh";
switch (sub)
{
case SUBLANG_CHINESE_TRADITIONAL: sl = "TW"; break;
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_CHINESE_SIMPLIFIED: sl = "CN"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_CHINESE_HONGKONG: sl = "HK"; break;
case SUBLANG_CHINESE_SINGAPORE: sl = "SG"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef SUBLANG_CHINESE_MACAU
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_CHINESE_MACAU: sl = "MO"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
}
break;
case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN
* What used to be called Serbo-Croatian
* should really now be two separate
* languages because of political reasons.
* (Says tml, who knows nothing about Serbian
* or Croatian.)
* (I can feel those flames coming already.)
*/
switch (sub)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
/* FIXME: How to distinguish Croatian and Latin Serbian locales? */
case SUBLANG_SERBIAN_LATIN: l = "sr"; break;
case SUBLANG_SERBIAN_CYRILLIC: l = "sr"; sl = "@cyrillic"; break;
default: l = "hr"; sl = "HR";
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
}
break;
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_CZECH: l = "cs"; sl = "CZ"; break;
case LANG_DANISH: l = "da"; sl = "DK"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_DUTCH:
l = "nl";
switch (sub)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_DUTCH: sl = "NL"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_DUTCH_BELGIAN: sl = "BE"; break;
}
break;
case LANG_ENGLISH:
l = "en";
switch (sub)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_ENGLISH_US: sl = "US"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_ENGLISH_UK: sl = "GB"; break;
case SUBLANG_ENGLISH_AUS: sl = "AU"; break;
case SUBLANG_ENGLISH_CAN: sl = "CA"; break;
case SUBLANG_ENGLISH_NZ: sl = "NZ"; break;
case SUBLANG_ENGLISH_EIRE: sl = "IE"; break;
Use "nn" for Nynorsk, as nn.po files are appearing now. If the sublanguage 2001-02-04 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale): Use "nn" for Nynorsk, as nn.po files are appearing now. If the sublanguage starts with '@', don't use a '_' separator. South Africa is 'ZA', not 'SA'.
2001-02-04 20:35:04 +01:00
case SUBLANG_ENGLISH_SOUTH_AFRICA: sl = "ZA"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_ENGLISH_JAMAICA: sl = "JM"; break;
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_ENGLISH_CARIBBEAN: sl = "GD"; break; /* Grenada? */
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_ENGLISH_BELIZE: sl = "BZ"; break;
case SUBLANG_ENGLISH_TRINIDAD: sl = "TT"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef SUBLANG_ENGLISH_ZIMBABWE
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_ENGLISH_ZIMBABWE: sl = "ZW"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef SUBLANG_ENGLISH_PHILIPPINES
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_ENGLISH_PHILIPPINES: sl = "PH"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
}
break;
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_ESTONIAN: l = "et"; sl = "EE"; break;
case LANG_FAEROESE: l = "fo"; sl = "FO"; break;
case LANG_FARSI: l = "fa"; sl = "IR"; break;
case LANG_FINNISH: l = "fi"; sl = "FI"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_FRENCH:
l = "fr";
switch (sub)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_FRENCH: sl = "FR"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_FRENCH_BELGIAN: sl = "BE"; break;
case SUBLANG_FRENCH_CANADIAN: sl = "CA"; break;
case SUBLANG_FRENCH_SWISS: sl = "CH"; break;
case SUBLANG_FRENCH_LUXEMBOURG: sl = "LU"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef SUBLANG_FRENCH_MONACO
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_FRENCH_MONACO: sl = "MC"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
}
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef LANG_GEORGIAN
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_GEORGIAN: l = "ka"; sl = "GE"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_GERMAN:
l = "de";
switch (sub)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_GERMAN: sl = "DE"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_GERMAN_SWISS: sl = "CH"; break;
case SUBLANG_GERMAN_AUSTRIAN: sl = "AT"; break;
case SUBLANG_GERMAN_LUXEMBOURG: sl = "LU"; break;
case SUBLANG_GERMAN_LIECHTENSTEIN: sl = "LI"; break;
}
break;
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_GREEK: l = "el"; sl = "GR"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef LANG_GUJARATI
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_GUJARATI: l = "gu"; sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_HEBREW: l = "he"; sl = "IL"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef LANG_HINDI
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_HINDI: l = "hi"; sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_HUNGARIAN: l = "hu"; sl = "HU"; break;
case LANG_ICELANDIC: l = "is"; sl = "IS"; break;
case LANG_INDONESIAN: l = "id"; sl = "ID"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_ITALIAN:
l = "it";
switch (sub)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_ITALIAN: sl = "IT"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_ITALIAN_SWISS: sl = "CH"; break;
}
break;
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_JAPANESE: l = "ja"; sl = "JP"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef LANG_KANNADA
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_KANNADA: l = "kn"; sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_KASHMIRI
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_KASHMIRI:
l = "ks";
switch (sub)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_DEFAULT: sl = "PK"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef SUBLANG_KASHMIRI_INDIA
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_KASHMIRI_INDIA: sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
}
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_KAZAK
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_KAZAK: l = "kk"; sl = "KZ"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_KONKANI
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_KONKANI:
/* FIXME: Adjust this when such locales appear on Unix. */
l = "kok"; sl = "IN";
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_KOREAN: l = "ko"; sl = "KR"; break;
case LANG_LATVIAN: l = "lv"; sl = "LV"; break;
case LANG_LITHUANIAN: l = "lt"; sl = "LT"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef LANG_MACEDONIAN
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_MACEDONIAN: l = "mk"; sl = "MK"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_MALAY
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_MALAY:
l = "ms";
switch (sub)
{
static correctness 2001-11-03 Hans Breuer <hans@breuer.org> * glib/giowin32.c : static correctness * glib/gwin32.c : some more #if defined (SUBLANG_* ... (g_win32_get_package_installation_subdirectory) use g_build_filename instead of duplicating its logic * glib/glib.def : removed duplicates, added mising, removed compat cruft
2001-11-03 17:51:10 +01:00
#ifdef SUBLANG_MALAY_MALAYSIA
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_MALAY_MALAYSIA: sl = "MY"; break;
static correctness 2001-11-03 Hans Breuer <hans@breuer.org> * glib/giowin32.c : static correctness * glib/gwin32.c : some more #if defined (SUBLANG_* ... (g_win32_get_package_installation_subdirectory) use g_build_filename instead of duplicating its logic * glib/glib.def : removed duplicates, added mising, removed compat cruft
2001-11-03 17:51:10 +01:00
#endif
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef SUBLANG_MALAY_BRUNEI_DARUSSALAM
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_MALAY_BRUNEI_DARUSSALAM: sl = "BN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
}
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_MALAYALAM
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_MALAYALAM: l = "ml"; sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_MANIPURI
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_MANIPURI:
/* FIXME: Adjust this when such locales appear on Unix. */
l = "mni"; sl = "IN";
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_MARATHI
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_MARATHI: l = "mr"; sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_NEPALI
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_NEPALI:
l = "ne";
switch (sub)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_DEFAULT: sl = "NP"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef SUBLANG_NEPALI_INDIA
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_NEPALI_INDIA: sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
}
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_NORWEGIAN:
l = "no";
switch (sub)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_NORWEGIAN_BOKMAL: sl = "NO"; break;
case SUBLANG_NORWEGIAN_NYNORSK: l = "nn"; sl = "NO"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
}
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef LANG_ORIYA
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_ORIYA: l = "or"; sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_POLISH: l = "pl"; sl = "PL"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_PORTUGUESE:
l = "pt";
switch (sub)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_PORTUGUESE: sl = "PT"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_PORTUGUESE_BRAZILIAN: sl = "BR"; break;
}
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef LANG_PUNJABI
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_PUNJABI: l = "pa"; sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_ROMANIAN: l = "ro"; sl = "RO"; break;
case LANG_RUSSIAN:
l = "ru"; /* sl could be "RU" or "UA". */
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef LANG_SANSKRIT
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_SANSKRIT: l = "sa"; sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_SINDHI
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_SINDHI: l = "sd"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_SLOVAK: l = "sk"; sl = "SK"; break;
case LANG_SLOVENIAN: l = "sl"; sl = "SI"; break;
#ifdef LANG_SORBIAN
case LANG_SORBIAN:
/* FIXME: Adjust this when such locales appear on Unix. */
l = "wen"; sl = "DE";
break;
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_SPANISH:
l = "es";
switch (sub)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_SPANISH: sl = "ES"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_SPANISH_MEXICAN: sl = "MX"; break;
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_SPANISH_MODERN:
sl = "ES@modern"; break; /* not seen on Unix */
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_SPANISH_GUATEMALA: sl = "GT"; break;
case SUBLANG_SPANISH_COSTA_RICA: sl = "CR"; break;
case SUBLANG_SPANISH_PANAMA: sl = "PA"; break;
case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: sl = "DO"; break;
case SUBLANG_SPANISH_VENEZUELA: sl = "VE"; break;
case SUBLANG_SPANISH_COLOMBIA: sl = "CO"; break;
case SUBLANG_SPANISH_PERU: sl = "PE"; break;
case SUBLANG_SPANISH_ARGENTINA: sl = "AR"; break;
case SUBLANG_SPANISH_ECUADOR: sl = "EC"; break;
case SUBLANG_SPANISH_CHILE: sl = "CL"; break;
case SUBLANG_SPANISH_URUGUAY: sl = "UY"; break;
case SUBLANG_SPANISH_PARAGUAY: sl = "PY"; break;
case SUBLANG_SPANISH_BOLIVIA: sl = "BO"; break;
case SUBLANG_SPANISH_EL_SALVADOR: sl = "SV"; break;
case SUBLANG_SPANISH_HONDURAS: sl = "HN"; break;
case SUBLANG_SPANISH_NICARAGUA: sl = "NI"; break;
case SUBLANG_SPANISH_PUERTO_RICO: sl = "PR"; break;
}
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef LANG_SWAHILI
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_SWAHILI: l = "sw"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_SWEDISH:
l = "sv";
switch (sub)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_DEFAULT: sl = "SE"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_SWEDISH_FINLAND: sl = "FI"; break;
}
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef LANG_TAMIL
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_TAMIL:
l = "ta"; /* sl could be "IN" or "LK". */
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_TATAR
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_TATAR: l = "tt"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_TELUGU
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_TELUGU: l = "te"; sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_THAI: l = "th"; sl = "TH"; break;
case LANG_TURKISH: l = "tr"; sl = "TR"; break;
case LANG_UKRAINIAN: l = "uk"; sl = "UA"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef LANG_URDU
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_URDU:
l = "ur";
switch (sub)
{
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef SUBLANG_URDU_PAKISTAN
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_URDU_PAKISTAN: sl = "PK"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef SUBLANG_URDU_INDIA
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case SUBLANG_URDU_INDIA: sl = "IN"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
}
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
#ifdef LANG_UZBEK
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
case LANG_UZBEK:
l = "uz";
switch (sub)
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
/* FIXME: Adjust this when Uzbek locales appear on Unix. */
static correctness 2001-11-03 Hans Breuer <hans@breuer.org> * glib/giowin32.c : static correctness * glib/gwin32.c : some more #if defined (SUBLANG_* ... (g_win32_get_package_installation_subdirectory) use g_build_filename instead of duplicating its logic * glib/glib.def : removed duplicates, added mising, removed compat cruft
2001-11-03 17:51:10 +01:00
#ifdef SUBLANG_UZBEK_LATIN
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_UZBEK_LATIN: sl = "UZ@latin"; break;
static correctness 2001-11-03 Hans Breuer <hans@breuer.org> * glib/giowin32.c : static correctness * glib/gwin32.c : some more #if defined (SUBLANG_* ... (g_win32_get_package_installation_subdirectory) use g_build_filename instead of duplicating its logic * glib/glib.def : removed duplicates, added mising, removed compat cruft
2001-11-03 17:51:10 +01:00
#endif
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#ifdef SUBLANG_UZBEK_CYRILLIC
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case SUBLANG_UZBEK_CYRILLIC: sl = "UZ@cyrillic"; break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
}
break;
Don't define LANG_AZERI etc in case those aren't defined in the headers 2001-11-08 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't defined in the headers (MSVC 5.0). (g_win32_getlocale): Instead, surround uses of those with #ifdef. Those MSVC 5.0 users that want to build a GLib that recognizes those languages should download the Platform SDK and use the headers from it. 2001-11-07 Peter Williams <peterw@ximian.com> * glib/gdir.c (g_dir_read_name): Return NULL when done reading.
2001-11-08 07:47:33 +01:00
#endif
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
case LANG_VIETNAMESE: l = "vi"; sl = "VN"; break;
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
default: l = "xx"; break;
}
strcpy (bfr, l);
if (sl != NULL)
{
Use "nn" for Nynorsk, as nn.po files are appearing now. If the sublanguage 2001-02-04 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale): Use "nn" for Nynorsk, as nn.po files are appearing now. If the sublanguage starts with '@', don't use a '_' separator. South Africa is 'ZA', not 'SA'.
2001-02-04 20:35:04 +01:00
if (sl[0] != '@')
strcat (bfr, "_");
glib.h Rename Win32-only functions from gwin_* to g_win32_* to match the 1999-11-01 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def: Rename Win32-only functions from gwin_* to g_win32_* to match the GLib naming conventions. * gutils.c * gwin32.c * testglib.c * makefile.{cygwin,msc}: Move the Win32-only functions to the new file gwin32.c
1999-11-01 21:46:44 +01:00
strcat (bfr, sl);
}
return g_strdup (bfr);
}
New function that returns the message string for a Win32 error code. 2000-03-04 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_error_message): New function that returns the message string for a Win32 error code. * glib.h: Declare it. * glib.def: Export it, plus g_node_copy. * gmodule-win32.c: Call g_win32_error_message() to get the error message strings. * libgplugin_a.c * libgplugin_b.c * gmodule.c: Remove LibMain functions that were needed by LCC, which is not a supported compiler. * testgmodule.c (main): Test for G_MODULE_IMPL == G_MODULE_IMPL_WIN32, not G_OS_WIN32. * gmoduleconf.h.win32: Remove LCC stuff from here, too.
1999-11-08 10:49:10 +01:00
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
/**
* g_win32_error_message:
Documentation cleanups. (#61487) 2001-10-01 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Documentation cleanups. (#61487)
2001-10-01 20:54:27 +02:00
* @error: error code.
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
*
* Translate a Win32 error code (as returned by GetLastError()) into
* the corresponding message. The message is either language neutral,
* or in the thread's language, or the user's language, the system's
Documentation cleanups. (#61487) 2001-10-01 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Documentation cleanups. (#61487)
2001-10-01 20:54:27 +02:00
* language, or US English (see docs for <function>FormatMessage()</function>). *
* The returned string should be deallocated with g_free().
docs 2001-04-16 Havoc Pennington <hp@redhat.com> * gqsort.c: docs * gfileutils.c: docs * gwin32.c: docs fixes * gconvert.c: docs * guniprop.c: docs * gutf8.c: docs
2001-04-16 22:05:25 +02:00
*
Documentation cleanups. (#61487) 2001-10-01 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Documentation cleanups. (#61487)
2001-10-01 20:54:27 +02:00
* Returns: newly-allocated error message
New function (DLL entry point) to tuck away actual DLL name. 2001-10-03 Tor Lillqvist <tml@iki.fi> * glib/gutils.c (Win32) (DllMain): New function (DLL entry point) to tuck away actual DLL name. (GLIB_LOCALE_DIR) Use actual DLL name, instead of assuming one naming convention for DLLs. * glib/glib.def: g_string_append_printf.
2001-10-03 22:19:13 +02:00
**/
New function that returns the message string for a Win32 error code. 2000-03-04 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_error_message): New function that returns the message string for a Win32 error code. * glib.h: Declare it. * glib.def: Export it, plus g_node_copy. * gmodule-win32.c: Call g_win32_error_message() to get the error message strings. * libgplugin_a.c * libgplugin_b.c * gmodule.c: Remove LibMain functions that were needed by LCC, which is not a supported compiler. * testgmodule.c (main): Test for G_MODULE_IMPL == G_MODULE_IMPL_WIN32, not G_OS_WIN32. * gmoduleconf.h.win32: Remove LCC stuff from here, too.
1999-11-08 10:49:10 +01:00
gchar *
g_win32_error_message (gint error)
{
gchar *msg;
gchar *retval;
int nbytes;
New function, otherwise like g_io_channel_win32_wait_for_condition(), but 2000-08-27 Tor Lillqvist <tml@iki.fi> * giowin32.c (g_io_channel_win32_poll): New function, otherwise like g_io_channel_win32_wait_for_condition(), but accept several GIOChannels. (g_io_channel_win32_wait_for_condition): Call g_io_channel_win32_poll(). * glib.h: Declare g_io_channel_win32_poll(). * gwin32.c (g_win32_error_message): Don't believe return value from FormatMessage.
2000-08-27 12:53:36 +02:00
FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER
|FORMAT_MESSAGE_IGNORE_INSERTS
|FORMAT_MESSAGE_FROM_SYSTEM,
NULL, error, 0,
(LPTSTR) &msg, 0, NULL);
nbytes = strlen (msg);
Typos.
1999-11-08 10:49:10 +01:00
if (nbytes > 2 && msg[nbytes-1] == '\n' && msg[nbytes-2] == '\r')
msg[nbytes-2] = '\0';
New function that returns the message string for a Win32 error code. 2000-03-04 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_error_message): New function that returns the message string for a Win32 error code. * glib.h: Declare it. * glib.def: Export it, plus g_node_copy. * gmodule-win32.c: Call g_win32_error_message() to get the error message strings. * libgplugin_a.c * libgplugin_b.c * gmodule.c: Remove LibMain functions that were needed by LCC, which is not a supported compiler. * testgmodule.c (main): Test for G_MODULE_IMPL == G_MODULE_IMPL_WIN32, not G_OS_WIN32. * gmoduleconf.h.win32: Remove LCC stuff from here, too.
1999-11-08 10:49:10 +01:00
retval = g_strdup (msg);
if (msg != NULL)
LocalFree (msg);
return retval;
}
Define ENABLE_NLS and GETTEXT_PACKAGE. 2001-01-17 Tor Lillqvist <tml@iki.fi> * config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE. * makefile.mingw.in * makefile.msc.in: Use the GNU intl library. * gwin32.c (g_win32_get_package_installation_directory): New function. To be used by various GLib-using packages to get their installation directory, which should be stored in the Registry by some installer. * gwin32.h: Declare it. * testglib.c (main): Test it. * gutils.c: On Win32, define GLIB_LOCALE_DIR using g_win32_get_package_installation_directory(). * glib.def: Update.
2001-01-16 23:06:23 +01:00
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
static gchar *
get_package_directory_from_module (gchar *module_name)
Define ENABLE_NLS and GETTEXT_PACKAGE. 2001-01-17 Tor Lillqvist <tml@iki.fi> * config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE. * makefile.mingw.in * makefile.msc.in: Use the GNU intl library. * gwin32.c (g_win32_get_package_installation_directory): New function. To be used by various GLib-using packages to get their installation directory, which should be stored in the Registry by some installer. * gwin32.h: Declare it. * testglib.c (main): Test it. * gutils.c: On Win32, define GLIB_LOCALE_DIR using g_win32_get_package_installation_directory(). * glib.def: Update.
2001-01-16 23:06:23 +01:00
{
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
static GHashTable *module_dirs = NULL;
glib/gwin32.c glib/gwin32.h Remove own implementation of dirent functions. 2001-09-30 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c * glib/gwin32.h * glib/glib.def: Remove own implementation of dirent functions. Instead, gcc (mingw) users should go ahead and use the <dirent.h> included with the mingw gcc, and the dirent functions included in libmingw32, while MSVC users can use the same (public domain) code, extracted from mingw-runtime sources and placed in build/win32/dirent.[ch]. * glib/gwin32.c (get_package_directory_from_module, g_win32_get_package_installation_directory): Use static lock to protect static hash table.
2001-09-30 01:19:24 +02:00
G_LOCK_DEFINE_STATIC (module_dirs);
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
HMODULE hmodule = NULL;
Don't store address of local variable in hashtable. 2001-02-10 Tor Lillqvist <tml@iki.fi> * gwin32.c (get_package_directory_from_module): Don't store address of local variable in hashtable.
2001-02-10 01:17:06 +01:00
gchar *fn;
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
gchar *p;
Define ENABLE_NLS and GETTEXT_PACKAGE. 2001-01-17 Tor Lillqvist <tml@iki.fi> * config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE. * makefile.mingw.in * makefile.msc.in: Use the GNU intl library. * gwin32.c (g_win32_get_package_installation_directory): New function. To be used by various GLib-using packages to get their installation directory, which should be stored in the Registry by some installer. * gwin32.h: Declare it. * testglib.c (main): Test it. * gutils.c: On Win32, define GLIB_LOCALE_DIR using g_win32_get_package_installation_directory(). * glib.def: Update.
2001-01-16 23:06:23 +01:00
gchar *result;
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
glib/gwin32.c glib/gwin32.h Remove own implementation of dirent functions. 2001-09-30 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c * glib/gwin32.h * glib/glib.def: Remove own implementation of dirent functions. Instead, gcc (mingw) users should go ahead and use the <dirent.h> included with the mingw gcc, and the dirent functions included in libmingw32, while MSVC users can use the same (public domain) code, extracted from mingw-runtime sources and placed in build/win32/dirent.[ch]. * glib/gwin32.c (get_package_directory_from_module, g_win32_get_package_installation_directory): Use static lock to protect static hash table.
2001-09-30 01:19:24 +02:00
G_LOCK (module_dirs);
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
if (module_dirs == NULL)
module_dirs = g_hash_table_new (g_str_hash, g_str_equal);
result = g_hash_table_lookup (module_dirs, module_name ? module_name : "");
if (result)
glib/gwin32.c glib/gwin32.h Remove own implementation of dirent functions. 2001-09-30 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c * glib/gwin32.h * glib/glib.def: Remove own implementation of dirent functions. Instead, gcc (mingw) users should go ahead and use the <dirent.h> included with the mingw gcc, and the dirent functions included in libmingw32, while MSVC users can use the same (public domain) code, extracted from mingw-runtime sources and placed in build/win32/dirent.[ch]. * glib/gwin32.c (get_package_directory_from_module, g_win32_get_package_installation_directory): Use static lock to protect static hash table.
2001-09-30 01:19:24 +02:00
{
G_UNLOCK (module_dirs);
return g_strdup (result);
}
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
if (module_name)
{
hmodule = GetModuleHandle (module_name);
if (!hmodule)
return NULL;
}
Don't store address of local variable in hashtable. 2001-02-10 Tor Lillqvist <tml@iki.fi> * gwin32.c (get_package_directory_from_module): Don't store address of local variable in hashtable.
2001-02-10 01:17:06 +01:00
fn = g_malloc (MAX_PATH);
if (!GetModuleFileName (hmodule, fn, MAX_PATH))
glib/gwin32.c glib/gwin32.h Remove own implementation of dirent functions. 2001-09-30 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c * glib/gwin32.h * glib/glib.def: Remove own implementation of dirent functions. Instead, gcc (mingw) users should go ahead and use the <dirent.h> included with the mingw gcc, and the dirent functions included in libmingw32, while MSVC users can use the same (public domain) code, extracted from mingw-runtime sources and placed in build/win32/dirent.[ch]. * glib/gwin32.c (get_package_directory_from_module, g_win32_get_package_installation_directory): Use static lock to protect static hash table.
2001-09-30 01:19:24 +02:00
{
G_UNLOCK (module_dirs);
Add macros G_WIN32_DLLMAIN_FOR_DLL_NAME and G_HARDCODED_PATH_WRAPPER. 2001-10-23 Tor Lillqvist <tml@iki.fi> * glib/gutils.h: Add macros G_WIN32_DLLMAIN_FOR_DLL_NAME and G_HARDCODED_PATH_WRAPPER. These are used to avoid hardcoding path names into Windows DLLs. * glib/gutils.c: Use them for GLIB_LOCALEDIR. * glib/gwin32.c (get_package_directory_from_module): Plug a small memory leak. Minor code reordering. (g_win32_get_package_installation_subdirectory): Allow empty subdir.
2001-10-23 01:19:19 +02:00
g_free (fn);
glib/gwin32.c glib/gwin32.h Remove own implementation of dirent functions. 2001-09-30 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c * glib/gwin32.h * glib/glib.def: Remove own implementation of dirent functions. Instead, gcc (mingw) users should go ahead and use the <dirent.h> included with the mingw gcc, and the dirent functions included in libmingw32, while MSVC users can use the same (public domain) code, extracted from mingw-runtime sources and placed in build/win32/dirent.[ch]. * glib/gwin32.c (get_package_directory_from_module, g_win32_get_package_installation_directory): Use static lock to protect static hash table.
2001-09-30 01:19:24 +02:00
return NULL;
}
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
Add macros G_WIN32_DLLMAIN_FOR_DLL_NAME and G_HARDCODED_PATH_WRAPPER. 2001-10-23 Tor Lillqvist <tml@iki.fi> * glib/gutils.h: Add macros G_WIN32_DLLMAIN_FOR_DLL_NAME and G_HARDCODED_PATH_WRAPPER. These are used to avoid hardcoding path names into Windows DLLs. * glib/gutils.c: Use them for GLIB_LOCALEDIR. * glib/gwin32.c (get_package_directory_from_module): Plug a small memory leak. Minor code reordering. (g_win32_get_package_installation_subdirectory): Allow empty subdir.
2001-10-23 01:19:19 +02:00
if ((p = strrchr (fn, G_DIR_SEPARATOR)) != NULL)
*p = '\0';
p = strrchr (fn, G_DIR_SEPARATOR);
if (p && (g_ascii_strcasecmp (p + 1, "bin") == 0 ||
g_ascii_strcasecmp (p + 1, "lib") == 0))
*p = '\0';
Cygwin support contributed by Stefan Ondrejicka <ondrej@idata.sk>. 2001-02-21 Tor Lillqvist <tml@iki.fi> Cygwin support contributed by Stefan Ondrejicka <ondrej@idata.sk>. Hopefully I got it all in while simultaneously adding support for auto*/libtool for mingw. * Makefile.am: Changes for auto* support on Cygwin and Win32. Do still distribute the hand-written makefiles and *.win32.in files, though. Use GIO, GSPAWN and PLATFORMDEP macros set by configure. Use -no-undefined. Pass -export-symbols glib.def to libtool. * configure.in: Define G_PLATFORM_WIN32 on both pure Win32 (mingw) and Cygwin. Add AC_CYGWIN, AC_EXEEXT and AC_LIBTOOL_WIN32_DLL calls for Cygwin and mingw support. Check for %I64u guint64 format (in MS C library). Set G_MODULE_IMPL on mingw and Cygwin. Use ac_object and ac_exeext. Set GIO, GSPAWN, PLATFORMDEP and G_LIBS_EXTRA. Compile timeloop only on Unix. Define OS_WIN32 automake conditional on Win32. * glib.h: Include gwin32.h also on Cygwin. * gfileutils.c (get_contents_posix): Use O_BINARY (defined as 0 on Unix) for Cygwin's sake. * gtimer.c (GETTIME): Reduce #ifdefs, use a macro GETTIME(). * gconvert.c * gthread.c * gutf8.c * gutils.c: For code needed both on Cygwin and native Win32, test for G_PLATFORM_WIN32. * gmarkup.h: Use G_BEGIN_DECLS and G_END_DECLS. * gtypes.h: Refine GLIB_VAR definition. Also check for DLL_EXPORT in case compiling a static library on Win32 or Cygwin. * gwin32.c: No <direct.h> on Cygwin. No need for ftruncate() or dirent emulation on Cygwin. (get_package_directory_from_module) Convert return value from GetModuleFileName() to POSIX path on Cygwin. * tests/Makefile.am (progs_LDADD): Link with libglib, libgthread and libgmodule as appropriate. Use -no-undefined. * gbacktrace.c: Move #ifdefs around a bit on Win32. * gshell.c (unquote_string_inplace): Make static. * testglib.c: Make some vars static. Add Cygwin path tests.
2001-03-09 22:31:21 +01:00
#ifdef G_WITH_CYGWIN
/* In Cygwin we need to have POSIX paths */
{
gchar tmp[MAX_PATH];
cygwin_conv_to_posix_path(fn, tmp);
g_free(fn);
fn = g_strdup(tmp);
}
#endif
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
g_hash_table_insert (module_dirs, module_name ? module_name : "", fn);
glib/gwin32.c glib/gwin32.h Remove own implementation of dirent functions. 2001-09-30 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c * glib/gwin32.h * glib/glib.def: Remove own implementation of dirent functions. Instead, gcc (mingw) users should go ahead and use the <dirent.h> included with the mingw gcc, and the dirent functions included in libmingw32, while MSVC users can use the same (public domain) code, extracted from mingw-runtime sources and placed in build/win32/dirent.[ch]. * glib/gwin32.c (get_package_directory_from_module, g_win32_get_package_installation_directory): Use static lock to protect static hash table.
2001-09-30 01:19:24 +02:00
G_UNLOCK (module_dirs);
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
return g_strdup (fn);
}
/**
* g_win32_get_package_installation_directory:
Documentation cleanups. (#61487) 2001-10-01 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Documentation cleanups. (#61487)
2001-10-01 20:54:27 +02:00
* @package: An identifier for a software package, or %NULL
* @dll_name: The name of a DLL that a package provides, or %NULL.
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
*
* Try to determine the installation directory for a software package.
* Typically used by GNU software packages.
*
* @package should be a short identifier for the package. Typically it
Documentation cleanups. (#61487) 2001-10-01 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Documentation cleanups. (#61487)
2001-10-01 20:54:27 +02:00
* is the same identifier as used for
* <literal>GETTEXT_PACKAGE</literal> in software configured according
* to GNU standards. The function first looks in the Windows Registry
* for the value <literal>#InstallationDirectory</literal> in the key
* <literal>#HKLM\Software\@package</literal>, and if that value
* exists and is a string, returns that.
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
*
Documentation cleanups. (#61487) 2001-10-01 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Documentation cleanups. (#61487)
2001-10-01 20:54:27 +02:00
* If @package is %NULL, or the above value isn't found in the
* Registry, but @dll_name is non-%NULL, it should name a DLL loaded
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
* into the current process. Typically that would be the name of the
* DLL calling this function, looking for its installation
* directory. The function then asks Windows what directory that DLL
* was loaded from. If that directory's last component is "bin" or
* "lib", the parent directory is returned, otherwise the directory
* itself. If that DLL isn't loaded, the function proceeds as if
Documentation cleanups. (#61487) 2001-10-01 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Documentation cleanups. (#61487)
2001-10-01 20:54:27 +02:00
* @dll_name was %NULL.
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
*
Documentation update. * glib/gwin32.c: Documentation update.
2001-10-05 00:23:03 +02:00
* If both @package and @dll_name are %NULL, the directory from where
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
* the main executable of the process was loaded is uses instead in
* the same way as above.
*
Documentation cleanups. (#61487) 2001-10-01 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Documentation cleanups. (#61487)
2001-10-01 20:54:27 +02:00
* Returns: a string containing the installation directory for @package.
* The return value should be freed with g_free() when not needed any longer.
**/
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
gchar *
g_win32_get_package_installation_directory (gchar *package,
gchar *dll_name)
{
static GHashTable *package_dirs = NULL;
glib/gwin32.c glib/gwin32.h Remove own implementation of dirent functions. 2001-09-30 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c * glib/gwin32.h * glib/glib.def: Remove own implementation of dirent functions. Instead, gcc (mingw) users should go ahead and use the <dirent.h> included with the mingw gcc, and the dirent functions included in libmingw32, while MSVC users can use the same (public domain) code, extracted from mingw-runtime sources and placed in build/win32/dirent.[ch]. * glib/gwin32.c (get_package_directory_from_module, g_win32_get_package_installation_directory): Use static lock to protect static hash table.
2001-09-30 01:19:24 +02:00
G_LOCK_DEFINE_STATIC (package_dirs);
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
gchar *result = NULL;
Define ENABLE_NLS and GETTEXT_PACKAGE. 2001-01-17 Tor Lillqvist <tml@iki.fi> * config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE. * makefile.mingw.in * makefile.msc.in: Use the GNU intl library. * gwin32.c (g_win32_get_package_installation_directory): New function. To be used by various GLib-using packages to get their installation directory, which should be stored in the Registry by some installer. * gwin32.h: Declare it. * testglib.c (main): Test it. * gutils.c: On Win32, define GLIB_LOCALE_DIR using g_win32_get_package_installation_directory(). * glib.def: Update.
2001-01-16 23:06:23 +01:00
gchar *key;
HKEY reg_key = NULL;
DWORD type;
DWORD nbytes;
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
if (package != NULL)
Define ENABLE_NLS and GETTEXT_PACKAGE. 2001-01-17 Tor Lillqvist <tml@iki.fi> * config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE. * makefile.mingw.in * makefile.msc.in: Use the GNU intl library. * gwin32.c (g_win32_get_package_installation_directory): New function. To be used by various GLib-using packages to get their installation directory, which should be stored in the Registry by some installer. * gwin32.h: Declare it. * testglib.c (main): Test it. * gutils.c: On Win32, define GLIB_LOCALE_DIR using g_win32_get_package_installation_directory(). * glib.def: Update.
2001-01-16 23:06:23 +01:00
{
glib/gwin32.c glib/gwin32.h Remove own implementation of dirent functions. 2001-09-30 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c * glib/gwin32.h * glib/glib.def: Remove own implementation of dirent functions. Instead, gcc (mingw) users should go ahead and use the <dirent.h> included with the mingw gcc, and the dirent functions included in libmingw32, while MSVC users can use the same (public domain) code, extracted from mingw-runtime sources and placed in build/win32/dirent.[ch]. * glib/gwin32.c (get_package_directory_from_module, g_win32_get_package_installation_directory): Use static lock to protect static hash table.
2001-09-30 01:19:24 +02:00
G_LOCK (package_dirs);
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
if (package_dirs == NULL)
package_dirs = g_hash_table_new (g_str_hash, g_str_equal);
result = g_hash_table_lookup (package_dirs, package);
if (result && result[0])
glib/gwin32.c glib/gwin32.h Remove own implementation of dirent functions. 2001-09-30 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c * glib/gwin32.h * glib/glib.def: Remove own implementation of dirent functions. Instead, gcc (mingw) users should go ahead and use the <dirent.h> included with the mingw gcc, and the dirent functions included in libmingw32, while MSVC users can use the same (public domain) code, extracted from mingw-runtime sources and placed in build/win32/dirent.[ch]. * glib/gwin32.c (get_package_directory_from_module, g_win32_get_package_installation_directory): Use static lock to protect static hash table.
2001-09-30 01:19:24 +02:00
{
G_UNLOCK (package_dirs);
return g_strdup (result);
}
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
key = g_strconcat ("Software\\", package, NULL);
nbytes = 0;
glib/gmain.c Mark the _funcs tables for export. 2001-09-18 Tor Lillqvist <tml@iki.fi> * glib/gmain.c * glib/giowin32.c: Mark the _funcs tables for export. * glib/glib.def: Add here, too. * glib/gwin32.c (get_package_directory_from_module): No reason to check for the module being in a bin or lib directory only when module_name is non-NULL. * glib/gwin32.c (g_win32_get_package_installation_directory): Check first in HKEY_CURRENT_USER, then in HKEY_LOCAL_MACHINE. * gmodule/Makefile.am: On Win32, pass a dummy -rpath flag to libtool when building libgplugin_[ab].la, otherwise libtool doesn't create a DLL, but a static archive.
2001-09-18 00:39:57 +02:00
if ((RegOpenKeyEx (HKEY_CURRENT_USER, key, 0,
KEY_QUERY_VALUE, &reg_key) == ERROR_SUCCESS
&& RegQueryValueEx (reg_key, "InstallationDirectory", 0,
&type, NULL, &nbytes) == ERROR_SUCCESS)
||
((RegOpenKeyEx (HKEY_LOCAL_MACHINE, key, 0,
KEY_QUERY_VALUE, &reg_key) == ERROR_SUCCESS
&& RegQueryValueEx (reg_key, "InstallationDirectory", 0,
&type, NULL, &nbytes) == ERROR_SUCCESS)
&& type == REG_SZ))
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
{
result = g_malloc (nbytes + 1);
RegQueryValueEx (reg_key, "InstallationDirectory", 0,
&type, result, &nbytes);
result[nbytes] = '\0';
}
if (reg_key != NULL)
RegCloseKey (reg_key);
g_free (key);
glib/gwin32.c glib/gwin32.h Remove own implementation of dirent functions. 2001-09-30 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c * glib/gwin32.h * glib/glib.def: Remove own implementation of dirent functions. Instead, gcc (mingw) users should go ahead and use the <dirent.h> included with the mingw gcc, and the dirent functions included in libmingw32, while MSVC users can use the same (public domain) code, extracted from mingw-runtime sources and placed in build/win32/dirent.[ch]. * glib/gwin32.c (get_package_directory_from_module, g_win32_get_package_installation_directory): Use static lock to protect static hash table.
2001-09-30 01:19:24 +02:00
if (result)
{
g_hash_table_insert (package_dirs, package, result);
G_UNLOCK (package_dirs);
return g_strdup (result);
}
G_UNLOCK (package_dirs);
Define ENABLE_NLS and GETTEXT_PACKAGE. 2001-01-17 Tor Lillqvist <tml@iki.fi> * config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE. * makefile.mingw.in * makefile.msc.in: Use the GNU intl library. * gwin32.c (g_win32_get_package_installation_directory): New function. To be used by various GLib-using packages to get their installation directory, which should be stored in the Registry by some installer. * gwin32.h: Declare it. * testglib.c (main): Test it. * gutils.c: On Win32, define GLIB_LOCALE_DIR using g_win32_get_package_installation_directory(). * glib.def: Update.
2001-01-16 23:06:23 +01:00
}
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
if (dll_name != NULL)
result = get_package_directory_from_module (dll_name);
Define ENABLE_NLS and GETTEXT_PACKAGE. 2001-01-17 Tor Lillqvist <tml@iki.fi> * config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE. * makefile.mingw.in * makefile.msc.in: Use the GNU intl library. * gwin32.c (g_win32_get_package_installation_directory): New function. To be used by various GLib-using packages to get their installation directory, which should be stored in the Registry by some installer. * gwin32.h: Declare it. * testglib.c (main): Test it. * gutils.c: On Win32, define GLIB_LOCALE_DIR using g_win32_get_package_installation_directory(). * glib.def: Update.
2001-01-16 23:06:23 +01:00
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
if (result == NULL)
result = get_package_directory_from_module (NULL);
Define ENABLE_NLS and GETTEXT_PACKAGE. 2001-01-17 Tor Lillqvist <tml@iki.fi> * config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE. * makefile.mingw.in * makefile.msc.in: Use the GNU intl library. * gwin32.c (g_win32_get_package_installation_directory): New function. To be used by various GLib-using packages to get their installation directory, which should be stored in the Registry by some installer. * gwin32.h: Declare it. * testglib.c (main): Test it. * gutils.c: On Win32, define GLIB_LOCALE_DIR using g_win32_get_package_installation_directory(). * glib.def: Update.
2001-01-16 23:06:23 +01:00
return result;
}
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
/**
* g_win32_get_package_installation_subdirectory:
Documentation update. * glib/gwin32.c: Documentation update.
2001-10-05 00:23:03 +02:00
* @package: An identifier for a software package, or %NULL.
* @dll_name: The name of a DLL that a package provides, or %NULL.
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
* @subdir: A subdirectory of the package installation directory.
*
Documentation update. * glib/gwin32.c: Documentation update.
2001-10-05 00:23:03 +02:00
* Returns a newly-allocated string containing the path of the
Documentation cleanups. (#61487) 2001-10-01 Tor Lillqvist <tml@iki.fi> * glib/gwin32.c: Documentation cleanups. (#61487)
2001-10-01 20:54:27 +02:00
* subdirectory @subdir in the return value from calling
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
* g_win32_get_package_installation_directory() with the @package and
Documentation update. * glib/gwin32.c: Documentation update.
2001-10-05 00:23:03 +02:00
* @dll_name parameters.
*
* Returns: a string containing the complete path to @subdir inside the
* installation directory of @package. The return value should be freed with
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
* g_free() when no longer needed.
New function (DLL entry point) to tuck away actual DLL name. 2001-10-03 Tor Lillqvist <tml@iki.fi> * glib/gutils.c (Win32) (DllMain): New function (DLL entry point) to tuck away actual DLL name. (GLIB_LOCALE_DIR) Use actual DLL name, instead of assuming one naming convention for DLLs. * glib/glib.def: g_string_append_printf.
2001-10-03 22:19:13 +02:00
**/
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
gchar *
g_win32_get_package_installation_subdirectory (gchar *package,
gchar *dll_name,
gchar *subdir)
{
gchar *prefix;
prefix = g_win32_get_package_installation_directory (package, dll_name);
static correctness 2001-11-03 Hans Breuer <hans@breuer.org> * glib/giowin32.c : static correctness * glib/gwin32.c : some more #if defined (SUBLANG_* ... (g_win32_get_package_installation_subdirectory) use g_build_filename instead of duplicating its logic * glib/glib.def : removed duplicates, added mising, removed compat cruft
2001-11-03 17:51:10 +01:00
return g_build_filename (prefix, subdir, NULL);
Add doc comments. (g_win32_get_package_installation_directory): Add one 2001-01-17 Tor Lillqvist <tml@iki.fi> * gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc comments. (g_win32_get_package_installation_directory): Add one parameter, the name of a DLL in the package. Add possibility to use that to deduce the installation directory if not entered into the Registry. Make the return value dynamically allocated. (g_win32_get_package_installation_subdirectory): New convenience function. * gutils.c (GLIB_LOCALE_DIR) * gwin32.h: Adapt accordingly. * testglib.c (main): Adapt tests accordingly.
2001-01-17 22:37:32 +01:00
}
Reference in New Issue Copy Permalink