From 0032a3c1b6cac3298dee062443617fc0e8cb5952 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 31 Oct 2004 17:41:29 +0000 Subject: [PATCH] Document G_WIN32_IS_NT_BASED, G_WIN32_HAVE_WIDECHAR_API. 2004-10-31 Matthias Clasen * glib/tmpl/windows.sgml: Document G_WIN32_IS_NT_BASED, G_WIN32_HAVE_WIDECHAR_API. * glib/glib-sections.txt: Add g_lstat * glib/running.sgml: Document G_WIN32_PRETEND_WIN9X. 200 --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ docs/reference/ChangeLog | 9 +++++++++ docs/reference/glib/glib-sections.txt | 1 + docs/reference/glib/running.sgml | 11 +++++++++++ docs/reference/glib/tmpl/windows.sgml | 18 ++++++++++++------ glib/gwin32.c | 11 +++++++---- 10 files changed, 65 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index c49f2a8f..dd8cbbf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-31 Matthias Clasen + + * glib/gwin32.c: Add bits of markup to g_win32_get_windows_version() + docs. + 2004-10-31 Tor Lillqvist * glib/gwin32.c: Document g_win32_get_windows_version(). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c49f2a8f..dd8cbbf0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-10-31 Matthias Clasen + + * glib/gwin32.c: Add bits of markup to g_win32_get_windows_version() + docs. + 2004-10-31 Tor Lillqvist * glib/gwin32.c: Document g_win32_get_windows_version(). diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index c49f2a8f..dd8cbbf0 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2004-10-31 Matthias Clasen + + * glib/gwin32.c: Add bits of markup to g_win32_get_windows_version() + docs. + 2004-10-31 Tor Lillqvist * glib/gwin32.c: Document g_win32_get_windows_version(). diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c49f2a8f..dd8cbbf0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-10-31 Matthias Clasen + + * glib/gwin32.c: Add bits of markup to g_win32_get_windows_version() + docs. + 2004-10-31 Tor Lillqvist * glib/gwin32.c: Document g_win32_get_windows_version(). diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c49f2a8f..dd8cbbf0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-10-31 Matthias Clasen + + * glib/gwin32.c: Add bits of markup to g_win32_get_windows_version() + docs. + 2004-10-31 Tor Lillqvist * glib/gwin32.c: Document g_win32_get_windows_version(). diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index fa8c45bd..6b52be4e 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,12 @@ +2004-10-31 Matthias Clasen + + * glib/tmpl/windows.sgml: Document G_WIN32_IS_NT_BASED, + G_WIN32_HAVE_WIDECHAR_API. + + * glib/glib-sections.txt: Add g_lstat + + * glib/running.sgml: Document G_WIN32_PRETEND_WIN9X. + 2004-10-29 Matthias Clasen * glib/tmpl/option.sgml: Add an example. diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt index ef611d2b..996ea5a8 100644 --- a/docs/reference/glib/glib-sections.txt +++ b/docs/reference/glib/glib-sections.txt @@ -991,6 +991,7 @@ g_open g_rename g_mkdir g_stat +g_lstat g_unlink g_remove g_fopen diff --git a/docs/reference/glib/running.sgml b/docs/reference/glib/running.sgml index f86fdf92..8cd4d58e 100644 --- a/docs/reference/glib/running.sgml +++ b/docs/reference/glib/running.sgml @@ -97,6 +97,17 @@ variables like LANG, PATH or HOME. + + <envar>G_WIN32_PRETEND_WIN9X</envar> + + + Setting this variable to any value forces g_win32_get_windows_version() + to return a version code for Windows 9x. This is mainly an internal + debugging aid for GTK+ and GLib developers, to be able to check the + code paths for Windows 9x. + + + diff --git a/docs/reference/glib/tmpl/windows.sgml b/docs/reference/glib/tmpl/windows.sgml index f544519f..07310efb 100644 --- a/docs/reference/glib/tmpl/windows.sgml +++ b/docs/reference/glib/tmpl/windows.sgml @@ -99,22 +99,28 @@ On non-Windows platforms, expands to nothing. will be stored. If this is used, you must also include windows.h. If you need a more complex DLL entry point function, you cannot use this. - -@static: -@dll_name: - +On Windows, this macro defines an expression which evaluates to %TRUE +if functions like _wopen(), _wrename(), etc., are available. + + +On non-Windows platforms, it is not defined. - +@Since: 2.6 - +On Windows, this macro defines an expression which evaluates to %TRUE +if the code is running on an NT-based Windows operating system. + + +On non-Windows platforms, it is not defined. +@Since: 2.6 diff --git a/glib/gwin32.c b/glib/gwin32.c index 4e06dfc0..db39cdd2 100644 --- a/glib/gwin32.c +++ b/glib/gwin32.c @@ -1313,12 +1313,15 @@ _g_win32_thread_init (void) * version and feature information should use Win32 API like * GetVersionEx() and VerifyVersionInfo(). * - * If there is an environment variable G_WIN32_PRETEND_WIN9X defined - * (with any value), this function always returns a version code for - * Windows 9x. This is mainly an internal debugging aid for GTK and - * GLib developers, to be able to check the code paths for Win9x. + * If there is an environment variable G_WIN32_PRETEND_WIN9X + * defined (with any value), this function always returns a version + * code for Windows 9x. This is mainly an internal debugging aid for + * GTK+ and GLib developers, to be able to check the code paths for + * Windows 9x. * * Returns: The version information. + * + * Since: 2.6 **/ guint g_win32_get_windows_version (void) -- 2.34.1