X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fgwin32.h;h=b466b63e6801873d0351766890dce05e438e78c2;hb=ecf1359191b2f796a7d63288652dd1a93525417d;hp=57933354781c64ebf64f0ca2920957c2dc237a9b;hpb=69801f8dc84c0c9403df6802eccc5d03328cd3ae;p=platform%2Fupstream%2Fglib.git
diff --git a/glib/gwin32.h b/glib/gwin32.h
index 5793335..b466b63 100644
--- a/glib/gwin32.h
+++ b/glib/gwin32.h
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see .
*/
/*
@@ -24,13 +22,13 @@
* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only can be included directly."
-#endif
-
#ifndef __G_WIN32_H__
#define __G_WIN32_H__
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
#ifdef G_PLATFORM_WIN32
@@ -65,6 +63,7 @@ G_BEGIN_DECLS
* g_win32_. Or that was the idea at some time, but there is just one
* of those:
*/
+GLIB_AVAILABLE_IN_ALL
gint g_win32_ftruncate (gint f,
guint size);
#endif /* G_OS_WIN32 */
@@ -75,34 +74,39 @@ gint g_win32_ftruncate (gint f,
* 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().
*/
+GLIB_AVAILABLE_IN_ALL
gchar* g_win32_getlocale (void);
/* Translate a Win32 error code (as returned by GetLastError()) into
* the corresponding message. The returned string should be deallocated
* with g_free().
*/
+GLIB_AVAILABLE_IN_ALL
gchar* g_win32_error_message (gint error);
-#ifndef G_DISABLE_DEPRECATED
-
-#define g_win32_get_package_installation_directory g_win32_get_package_installation_directory_utf8
-#define g_win32_get_package_installation_subdirectory g_win32_get_package_installation_subdirectory_utf8
-
+#ifndef _WIN64
+GLIB_DEPRECATED
gchar* g_win32_get_package_installation_directory (const gchar *package,
const gchar *dll_name);
+GLIB_DEPRECATED
gchar* g_win32_get_package_installation_subdirectory (const gchar *package,
const gchar *dll_name,
const gchar *subdir);
-
#endif
+GLIB_AVAILABLE_IN_ALL
gchar* g_win32_get_package_installation_directory_of_module (gpointer hmodule);
+GLIB_AVAILABLE_IN_ALL
guint g_win32_get_windows_version (void);
+GLIB_AVAILABLE_IN_ALL
gchar* g_win32_locale_filename_from_utf8 (const gchar *utf8filename);
+GLIB_AVAILABLE_IN_2_40
+gchar ** g_win32_get_command_line (void);
+
/* As of GLib 2.14 we only support NT-based Windows */
#define G_WIN32_IS_NT_BASED() TRUE
#define G_WIN32_HAVE_WIDECHAR_API() TRUE
@@ -111,4 +115,20 @@ G_END_DECLS
#endif /* G_PLATFORM_WIN32 */
+#ifdef G_OS_WIN32
+#ifdef _WIN64
+#define g_win32_get_package_installation_directory g_win32_get_package_installation_directory_utf8
+#define g_win32_get_package_installation_subdirectory g_win32_get_package_installation_subdirectory_utf8
+#endif
+
+GLIB_AVAILABLE_IN_ALL
+gchar *g_win32_get_package_installation_directory_utf8 (const gchar *package,
+ const gchar *dll_name);
+GLIB_AVAILABLE_IN_ALL
+gchar *g_win32_get_package_installation_subdirectory_utf8 (const gchar *package,
+ const gchar *dll_name,
+ const gchar *subdir);
+
+#endif /* G_OS_WIN32 */
+
#endif /* __G_WIN32_H__ */